diff options
| author | nchalko <nchalko@google.com> | 2018-02-02 12:03:21 -0800 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2018-02-02 13:44:04 -0800 |
| commit | 738ed887c2cd09474d3a714009b48265792b7aa8 (patch) | |
| tree | 5f417e548b76778fff582fb7db01436ecf891782 /partner_support | |
| parent | 374bab7adcba29bf4e272b88afff420933fed5a9 (diff) | |
| download | TV-738ed887c2cd09474d3a714009b48265792b7aa8.tar.gz | |
Update make and manifest files to match master branch
PiperOrigin-RevId: 184315365
Change-Id: I7d3ac78adda9f5b7877a78f8268f78ae2f93612a
Diffstat (limited to 'partner_support')
| -rw-r--r-- | partner_support/Android.mk | 28 | ||||
| -rw-r--r-- | partner_support/sample_customization/Android.mk | 3 |
2 files changed, 2 insertions, 29 deletions
diff --git a/partner_support/Android.mk b/partner_support/Android.mk index 413b17e1..9a45e705 100644 --- a/partner_support/Android.mk +++ b/partner_support/Android.mk @@ -9,38 +9,14 @@ LOCAL_MODULE_CLASS := STATIC_JAVA_LIBRARIES LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := system_current +LOCAL_USE_AAPT2 := true + LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_STATIC_JAVA_LIBRARIES := android-support-annotations -LOCAL_STATIC_JAVA_LIBRARIES += auto-value-jar - -# Libraries needed by the compiler (JACK) to generate code. -PROCESSOR_LIBRARIES_TARGET := \ - auto-value-jar \ - -# 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)) include $(LOCAL_PATH)/buildconfig.mk include $(BUILD_STATIC_JAVA_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) - - -############################################################# -# Pre-built dependency jars -############################################################# -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += auto-value-jar:../../../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3.jar - - - diff --git a/partner_support/sample_customization/Android.mk b/partner_support/sample_customization/Android.mk index 8831f5be..11ed13b0 100644 --- a/partner_support/sample_customization/Android.mk +++ b/partner_support/sample_customization/Android.mk @@ -1,9 +1,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -# Include all java files. -LOCAL_SRC_FILES := $(call all-java-files-under, src) - LOCAL_PACKAGE_NAME := PartnerSupportSampleCustomization LOCAL_MODULE_TAGS := optional |