diff options
| author | Roland Levillain <rpl@google.com> | 2017-08-24 14:41:12 +0100 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2017-09-01 18:20:40 +0100 |
| commit | 05d6361f9e8de48ca3e13fc5eb0f3eb00d5a6d13 (patch) | |
| tree | 5e0ecbc6c2f01ca8de1746959faad477b0e2d0c1 | |
| parent | c39ea3c55fac807c0b98aabdf56c70dc8a49036c (diff) | |
Explicitly specify annotation processor classes for Grok.
Test: mmma packages/apps/Dialer
Test: make dist grok-index ALTERNATE_JAVAC=vendor/unbundled_google/tools/grok/javac_wrapper.sh GROK_ROOT_DIRECTORY=`pwd` (on mirror-aosp-master)
Bug: 64948335
Change-Id: I98af4233f86369dfb1c85062d90cf3164819207d
| -rw-r--r-- | Android.mk | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk index 357fdff44..db0aed463 100644 --- a/Android.mk +++ b/Android.mk @@ -208,11 +208,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 \ @@ -221,13 +220,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 @@ -265,8 +259,6 @@ SRC_DIRS := EXCLUDE_FILES := RES_DIRS := DIALER_MANIFEST_FILES := -PROCESSOR_LIBRARIES_TARGET := -PROCESSOR_JARS := EXCLUDE_MANIFESTS := EXCLUDE_EXTRA_PACKAGES := @@ -287,7 +279,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) @@ -462,3 +454,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) |