summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorzachh <zachh@google.com>2018-01-08 19:58:37 +0000
committerzachh <zachh@google.com>2018-01-08 19:58:37 +0000
commit2b4d08c2895265d6054bfbcfc030786427755428 (patch)
treedbda20e83cb3458fefec613b56d4b9d0a4814e66 /Android.mk
parent47c8bc43469917bd29cd6b0b2375f6c86adb76f3 (diff)
downloadandroid_packages_apps_Dialer-2b4d08c2895265d6054bfbcfc030786427755428.tar.gz
android_packages_apps_Dialer-2b4d08c2895265d6054bfbcfc030786427755428.tar.bz2
android_packages_apps_Dialer-2b4d08c2895265d6054bfbcfc030786427755428.zip
Revert "Updated dialer guava to V23 and autovalue to V1.5.2."
This reverts commit 47c8bc43469917bd29cd6b0b2375f6c86adb76f3. Change-Id: I0c3590166977b6254b535939d7a8fa2a0a44bc55
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index e06e40398..f90875db3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -182,7 +182,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.5.2/auto-value-1.5.2.jar \
+ dialer-auto-value:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3.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 \
@@ -191,7 +191,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/23.0/guava-23.0.jar \
+ dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.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
@@ -204,7 +204,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/23.0/guava-23.0.jar
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0.jar
LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_PREBUILT)
@@ -384,7 +384,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.5.2/auto-value-1.5.2.jar
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3.jar
LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_PREBUILT)