diff options
| author | zachh <zachh@google.com> | 2018-01-09 21:44:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-09 21:44:32 +0000 |
| commit | 11b25bdbd3301f6ab992c14d31d19e6a1eeb72a2 (patch) | |
| tree | 4dff49bbe358912daf4d079358136c5861e19763 /Android.mk | |
| parent | afd990b98203144373123dbfc1f6fa39ff411f3a (diff) | |
| parent | 20b4d5a6ae660550d767f53871a8321a9e233fd8 (diff) | |
Merge "Revert "Revert "Updated dialer guava to V23 and autovalue to V1.5.2.""" am: 455a7c27d5 am: a470c3cf18
am: 20b4d5a6ae
Change-Id: I08303fd37c6650d03bc447f95150376a256adb5f
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 927d17bda..e4283863a 100644 --- a/Android.mk +++ b/Android.mk @@ -187,7 +187,7 @@ EXCLUDE_EXTRA_PACKAGES := include $(CLEAR_VARS) LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ - dialer-auto-value:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3.jar \ + dialer-auto-value:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar \ dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7.jar \ dialer-dagger2:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7.jar \ dialer-dagger2-producers:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-producers/2.7/dagger-producers-2.7.jar \ @@ -196,7 +196,7 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ dialer-grpc-okhttp:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3.jar \ dialer-grpc-protobuf-lite:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3.jar \ dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3.jar \ - dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0.jar \ + dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/23.0/guava-23.0.jar \ dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar \ dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar @@ -209,7 +209,7 @@ 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.jar +LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/23.0/guava-23.0.jar LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_PREBUILT) @@ -389,7 +389,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE := dialer-auto-value-target LOCAL_SDK_VERSION := current -LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3.jar +LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar LOCAL_UNINSTALLABLE_MODULE := true include $(BUILD_PREBUILT) |