diff options
| author | Roland Levillain <rpl@google.com> | 2017-09-07 13:41:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-07 13:41:03 +0000 |
| commit | 4a91d635a61c7485158df482e4b6f93e6da532f4 (patch) | |
| tree | 99615ad21b18b690ee482b4606e2fed195782bec /Android.mk | |
| parent | a0a21e3c1e29da0ead766115566e2116ac61dac1 (diff) | |
| parent | 08a1a974260d0d7f9d4f75d3b37b77172aa9531c (diff) | |
Merge commit 'f63d4faaa2d037e0778a3cd82569f54d1901287d' into manual_merge_f63d4faaa am: f6db8e0257 am: 54eede6d25
am: 08a1a97426
Change-Id: I95179825121d49ded8af39e6e2498b9115fdccf5
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk index ba74297ce..8c4f9d6c0 100644 --- a/Android.mk +++ b/Android.mk @@ -213,11 +213,10 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v7-recyclerview \ LOCAL_JAVA_LIBRARIES := \ - dialer-auto-value \ + dialer-auto-value-target \ org.apache.http.legacy \ -# Libraries needed by the compiler (JACK) to generate code. -PROCESSOR_LIBRARIES_TARGET := \ +LOCAL_ANNOTATION_PROCESSORS := \ dialer-auto-value \ dialer-dagger2 \ dialer-dagger2-compiler \ @@ -226,13 +225,8 @@ PROCESSOR_LIBRARIES_TARGET := \ dialer-javax-annotation-api \ dialer-javax-inject \ -# Resolve the jar paths. -PROCESSOR_JARS := $(call java-lib-deps, $(PROCESSOR_LIBRARIES_TARGET)) -# Necessary for annotation processors to work correctly. -LOCAL_ADDITIONAL_DEPENDENCIES += $(PROCESSOR_JARS) - -LOCAL_JACK_FLAGS += --processorpath $(call normalize-path-list,$(PROCESSOR_JARS)) -LOCAL_JAVACFLAGS += -processorpath $(call normalize-path-list,$(PROCESSOR_JARS)) +LOCAL_ANNOTATION_PROCESSOR_CLASSES := \ + com.google.auto.value.processor.AutoValueProcessor,dagger.internal.codegen.ComponentProcessor # Begin Bug: 37077388 @@ -270,8 +264,6 @@ SRC_DIRS := EXCLUDE_FILES := RES_DIRS := DIALER_MANIFEST_FILES := -PROCESSOR_LIBRARIES_TARGET := -PROCESSOR_JARS := EXCLUDE_MANIFESTS := EXCLUDE_EXTRA_PACKAGES := @@ -292,7 +284,7 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2$(COMMON_JAVA_PACKAGE_SUFFIX) \ dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1$(COMMON_JAVA_PACKAGE_SUFFIX) -include $(BUILD_MULTI_PREBUILT) +include $(BUILD_HOST_PREBUILT) # Enumerate target prebuilts to avoid linker warnings like # Dialer (java:sdk) should not link to dialer-guava (java:platform) @@ -457,3 +449,13 @@ 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.3/auto-value-1.3$(COMMON_JAVA_PACKAGE_SUFFIX) +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) |