diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-09-05 10:53:21 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-09-05 10:55:03 -0700 |
| commit | 9bfcb3d92d522791cbf6b0e515273bae6dc2bd0a (patch) | |
| tree | dcf552cba05e73a19f628f60101769d3e6573ca4 | |
| parent | bef5747b0dd3408ed4789b4fc71c9d6798d091bc (diff) | |
Don't use guava prebuilts outside of annotations processing.
This results in class incompatiblity with other dependencies that are
transitively dependent on the same library.
Test: make, flash, th
Bug: 65254753
Change-Id: Idfbae76a38e64bb96eb824cda3d201ae63a13e90
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index beaa2c5ec..ba74297ce 100644 --- a/Android.mk +++ b/Android.mk @@ -191,16 +191,16 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ dialer-grpc-okhttp-target \ dialer-grpc-protobuf-lite-target \ dialer-grpc-stub-target \ - dialer-guava-target \ dialer-javax-annotation-api-target \ dialer-javax-inject-target \ dialer-libshortcutbadger-target \ dialer-mime4j-core-target \ dialer-mime4j-dom-target \ + guava \ jsr305 \ + libbackup \ libphonenumber \ volley \ - libbackup \ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-core-ui \ @@ -299,16 +299,6 @@ include $(BUILD_MULTI_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE := dialer-guava-target -LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX) -LOCAL_UNINSTALLABLE_MODULE := true - -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) - -LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE := dialer-dagger2-target LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) |