From f601f8c507f38af9fd426f338cadfb715e01c1bd Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sun, 8 Oct 2017 10:33:36 +0100 Subject: [PATCH] msm8937-common: Doze: Build with AAPT2 Change-Id: Iab14804817e6b90bf4d773d9359a04f1e119264a --- doze/Android.mk | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/doze/Android.mk b/doze/Android.mk index 39938a8..8667683 100644 --- a/doze/Android.mk +++ b/doze/Android.mk @@ -8,25 +8,23 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := XiaomiDoze LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true -LOCAL_STATIC_JAVA_LIBRARIES := \ + +LOCAL_USE_AAPT2 := true + +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v4 \ android-support-v13 \ android-support-v7-recyclerview \ android-support-v7-preference \ android-support-v7-appcompat \ android-support-v14-preference \ + +LOCAL_STATIC_JAVA_LIBRARIES := \ org.lineageos.platform.internal LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ - $(LOCAL_PATH)/../../../../packages/resources/devicesettings/res \ - frameworks/support/v7/preference/res \ - frameworks/support/v14/preference/res \ - frameworks/support/v7/appcompat/res \ - frameworks/support/v7/recyclerview/res - -LOCAL_AAPT_FLAGS := --auto-add-overlay \ - --extra-packages android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview + $(TOP)/packages/resources/devicesettings/res LOCAL_PROGUARD_FLAG_FILES := proguard.flags