From 569d9a2c519ae7553240d7b083e9bce1989743ab Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 31 Mar 2018 11:39:09 +0100 Subject: [PATCH] Updater: Build with AAPT2 Change-Id: I45553984269bd2375311047b053e01f67349c695 --- Android.mk | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Android.mk b/Android.mk index 1ef91fd..f062386 100644 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,9 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := \ +LOCAL_USE_AAPT2 := true + +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-design \ android-support-transition \ android-support-v4 \ @@ -16,21 +18,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v7-recyclerview LOCAL_RESOURCE_DIR := \ - $(TOP)/frameworks/support/design/res \ - $(TOP)/frameworks/support/v7/appcompat/res \ - $(TOP)/frameworks/support/v7/cardview/res \ - $(TOP)/frameworks/support/v7/preference/res \ - $(TOP)/frameworks/support/v7/recyclerview/res \ $(LOCAL_PATH)/res -LOCAL_AAPT_FLAGS := \ - --auto-add-overlay \ - --extra-packages android.support.design \ - --extra-packages android.support.v7.appcompat \ - --extra-packages android.support.v7.cardview \ - --extra-packages android.support.v7.preference \ - --extra-packages android.support.v7.recyclerview - LOCAL_PACKAGE_NAME := Updater LOCAL_PRIVILEGED_MODULE := true LOCAL_PROGUARD_FLAG_FILES := proguard.flags