From 9fd73a0aeb0ab4aaaaaf5ac10992cf4063a01c22 Mon Sep 17 00:00:00 2001 From: Alberto97 Date: Tue, 5 Sep 2017 14:10:27 +0200 Subject: [PATCH] MotoActions: Build with AAPT2 Change-Id: Ic1287412680509f87dab806b8745cc1c04b8df04 --- MotoActions/Android.mk | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/MotoActions/Android.mk b/MotoActions/Android.mk index a5fa7a5..b001209 100644 --- a/MotoActions/Android.mk +++ b/MotoActions/Android.mk @@ -8,25 +8,19 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := MotoActions LOCAL_CERTIFICATE := platform LOCAL_PROPRIETARY_MODULE := true +LOCAL_USE_AAPT2 := true -LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-v14-preference \ +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v7-appcompat \ android-support-v7-preference \ - android-support-v7-recyclerview + android-support-v7-recyclerview \ + android-support-v14-preference LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res \ - $(LOCAL_PATH)/../../../../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:android.support.v7.appcompat:android.support.v7.preference:android.support.v7.recyclerview + $(LOCAL_PATH)/../../../../packages/resources/devicesettings/res LOCAL_PROGUARD_ENABLED := disabled