From d0e208008ccc1385c0ca61fe0bd40e7f92fcb9e8 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 25 Aug 2018 12:31:48 +0200 Subject: [PATCH] AdvancedDisplay: Migrate to AAPT2 Change-Id: I59dabea4484dd1f1e5c57ae2ac37b9939d2c875d --- AdvancedDisplay/Android.mk | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/AdvancedDisplay/Android.mk b/AdvancedDisplay/Android.mk index e0d82fa0..ca646487 100644 --- a/AdvancedDisplay/Android.mk +++ b/AdvancedDisplay/Android.mk @@ -8,31 +8,24 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := AdvancedDisplay LOCAL_CERTIFICATE := platform -LOCAL_STATIC_JAVA_LIBRARIES := \ +LOCAL_USE_AAPT2 := true + +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v4 \ android-support-v7-appcompat \ android-support-v7-preference \ android-support-v7-recyclerview \ android-support-v13 \ - android-support-v14-preference \ - org.lineageos.platform.internal + android-support-v14-preference -LOCAL_PROGUARD_FLAG_FILES := proguard.flags +LOCAL_STATIC_JAVA_LIBRARIES := \ + org.lineageos.platform.internal LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ - $(TOP)/packages/resources/devicesettings/res \ - frameworks/support/v14/preference/res \ - frameworks/support/v7/appcompat/res \ - frameworks/support/v7/preference/res \ - frameworks/support/v7/recyclerview/res - -LOCAL_AAPT_FLAGS := \ - --auto-add-overlay \ - --extra-packages android.support.v14.preference \ - --extra-packages android.support.v7.appcompat \ - --extra-packages android.support.v7.preference \ - --extra-packages android.support.v7.recyclerview + $(TOP)/packages/resources/devicesettings/res + +LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE)