Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0199744c authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Use AutoValue from external/auto" am: 434cfb8a 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1344937

Change-Id: I22d24f8ae569bac6df63e0a6b920a5848ab6af13
parents 53884bc5 434cfb8a

Android.mk

+4 −16
Original line number Diff line number Diff line
@@ -143,11 +143,11 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
	android-support-v7-recyclerview \



LOCAL_JAVA_LIBRARIES := \

	dialer-auto-value-target \

	auto_value_annotations \

	org.apache.http.legacy \



LOCAL_ANNOTATION_PROCESSORS := \

	dialer-auto-value \

	auto_value_plugin \

	javapoet-prebuilt-jar \

	dialer-dagger2 \

	dialer-dagger2-compiler \
@@ -191,7 +191,6 @@ 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-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 \
@@ -205,8 +204,6 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ 
    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 \

    dialer-auto-service:../../../prebuilts/tools/common/m2/repository/com/google/auto/service/auto-service/1.0-rc2/auto-service-1.0-rc2.jar \

    dialer-auto-common:../../../prebuilts/tools/common/m2/repository/com/google/auto/auto-common/0.9/auto-common-0.9.jar \



include $(BUILD_HOST_PREBUILT)
@@ -402,15 +399,6 @@ LOCAL_UNINSTALLABLE_MODULE := true 


include $(BUILD_PREBUILT)



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_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)
@@ -482,8 +470,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	dialer-guava \

	dialer-dagger2 \

	javapoet-prebuilt-jar \

	dialer-auto-service \

	dialer-auto-common \

	auto_service_annotations \

	auto_common \

	dialer-javax-annotation-api \

	dialer-javax-inject