diff options
| author | Alan Viverette <alanv@google.com> | 2018-02-08 17:24:08 -0500 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2018-02-09 10:47:11 -0500 |
| commit | c312259414650d727580ee0d719894b50a71c36e (patch) | |
| tree | c5810884558f7aae930ac00ea33fc308118b7e27 | |
| parent | f52f7bfd559224bc17a8717bdcfaa0aee4c7b3a7 (diff) | |
| download | TV-c312259414650d727580ee0d719894b50a71c36e.tar.gz | |
Migrate to AAPT2
Bug: 73128633
Test: m PartnerSupportSampleTvInput
Change-Id: If4a5f4a84abf7cb50d80bacb37615755ca51a5aa
| -rw-r--r-- | partner_support/samples/Android.mk | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/partner_support/samples/Android.mk b/partner_support/samples/Android.mk index 20faf718..922a5b5d 100644 --- a/partner_support/samples/Android.mk +++ b/partner_support/samples/Android.mk @@ -9,18 +9,16 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ + live-channels-partner-support + +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-compat \ android-support-core-ui \ android-support-v7-recyclerview \ android-support-v17-leanback \ - live-channels-partner-support \ - android-support-tv-provider \ - + android-support-tv-provider -LOCAL_AAPT_FLAGS := --auto-add-overlay \ - --extra-packages android.support.compat \ - --extra-packages android.support.v7.recyclerview \ - --extra-packages android.support.v17.leanback \ +LOCAL_USE_AAPT2 := true LOCAL_PROGUARD_ENABLED := disabled # Overlay view related functionality requires system APIs. @@ -30,10 +28,6 @@ LOCAL_MIN_SDK_VERSION := 23 # M # Required for com.android.tv.permission.RECEIVE_INPUT_EVENT LOCAL_PRIVILEGED_MODULE := true -LOCAL_RESOURCE_DIR := \ - $(TOP)/prebuilts/sdk/current/support/compat/res \ - $(TOP)/prebuilts/sdk/current/support/v7/recyclerview/res \ - $(TOP)/prebuilts/sdk/current/support/v17/leanback/res \ - $(LOCAL_PATH)/res +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res include $(BUILD_PACKAGE) |