diff options
| author | Zachary Heidepriem <zachh@google.com> | 2017-11-10 15:07:54 -0800 |
|---|---|---|
| committer | Zachary Heidepriem <zachh@google.com> | 2017-11-10 15:07:54 -0800 |
| commit | 9f39c2f5564bbe16bc74776f73f8425a7ee1d3f9 (patch) | |
| tree | 5b6740a57a25b6b27ed3d498092b2da2c913a757 /Android.mk | |
| parent | cd8d440128b7ee653d80509faa6132684dfb0b38 (diff) | |
| download | android_packages_apps_Dialer-9f39c2f5564bbe16bc74776f73f8425a7ee1d3f9.tar.gz android_packages_apps_Dialer-9f39c2f5564bbe16bc74776f73f8425a7ee1d3f9.tar.bz2 android_packages_apps_Dialer-9f39c2f5564bbe16bc74776f73f8425a7ee1d3f9.zip | |
Use prebuilt guava for dialer.
We are now using guava APIs from guava 20, and AOSP guava is stuck at 18.
Test: mma
Change-Id: Ie053a5d8a30a41c7ce0deaaa01a3e17febc651cf
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 094ad5a6c..9defc7e45 100644 --- a/Android.mk +++ b/Android.mk @@ -184,7 +184,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ dialer-libshortcutbadger-target \ dialer-mime4j-core-target \ dialer-mime4j-dom-target \ - guava \ + dialer-guava-target \ jsr305 \ libbackup \ libphonenumber \ @@ -278,6 +278,16 @@ 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) |