diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-14 21:45:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-14 21:45:36 +0000 |
| commit | 22195008a3a5264aec2ca9352d33338428444032 (patch) | |
| tree | e198781fad6c03fce86f965e8757674e9175d2d5 | |
| parent | bcfb0b48fc8bfddf0bf1b71c14d130e812c32c2b (diff) | |
| parent | c4bd4e3e84714cfb2ccdb530fe00a786b868adbb (diff) | |
Merge "Don't use guava prebuilts outside of annotations processing."
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index 2c511e1e6..0f138914f 100644 --- a/Android.mk +++ b/Android.mk @@ -178,16 +178,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 \ @@ -277,16 +277,6 @@ include $(BUILD_HOST_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) |