diff options
| author | nchalko <nchalko@google.com> | 2018-02-01 16:38:23 -0800 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2018-02-02 13:42:57 -0800 |
| commit | 9ad3ddb6de75fbe62cc69b59db184936ae5846d2 (patch) | |
| tree | b19198054e8910ad2e77414a0a3b84cb5d374d4c /partner_support | |
| parent | 6c5e955567e2711106fd5690fa0a906f39c0659a (diff) | |
| download | TV-9ad3ddb6de75fbe62cc69b59db184936ae5846d2.tar.gz | |
SampleDvbTuner should not use ENABLE_LINEUP_SELECTION
PiperOrigin-RevId: 184214878
Change-Id: If2e7671eba549b3a2fd617e1b60dc7da237a461b
Diffstat (limited to 'partner_support')
| -rw-r--r-- | partner_support/Android.mk | 27 | ||||
| -rw-r--r-- | partner_support/sample_customization/Android.mk | 2 |
2 files changed, 26 insertions, 3 deletions
diff --git a/partner_support/Android.mk b/partner_support/Android.mk index 65513d7d..413b17e1 100644 --- a/partner_support/Android.mk +++ b/partner_support/Android.mk @@ -9,11 +9,22 @@ 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 @@ -21,3 +32,15 @@ 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 3ef368ba..8831f5be 100644 --- a/partner_support/sample_customization/Android.mk +++ b/partner_support/sample_customization/Android.mk @@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) # Include all java files. -#LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := PartnerSupportSampleCustomization LOCAL_MODULE_TAGS := optional |