From 2789e544f147b01bbf6c2ab55fd03ba453f23342 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Fri, 23 Mar 2018 14:33:43 -0400 Subject: [PATCH] Migrate to AAPT2 Bug: 73128633 Test: make checkbuild Change-Id: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff Merged-In: I4b6b73299d1cae61994c34ebb77ca587c5ee64ff (cherry picked from commit e3264ba6cf7df5b33b10dd6a15ac5010c78bac6e) --- packages/SettingsLib/Android.mk | 2 ++ packages/SettingsLib/common.mk | 42 --------------------------------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk index 37cb721bba282..fd7c87e2545bd 100644 --- a/packages/SettingsLib/Android.mk +++ b/packages/SettingsLib/Android.mk @@ -3,6 +3,8 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true +LOCAL_AAPT2_ONLY := true + LOCAL_MODULE := SettingsLib LOCAL_SHARED_ANDROID_LIBRARIES := \ diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 46b66c4900e60..ec7ca2e418850 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -13,49 +13,7 @@ # include frameworks/base/packages/SettingsLib/common.mk # -ifeq ($(LOCAL_USE_AAPT2),true) LOCAL_STATIC_ANDROID_LIBRARIES += \ android-support-annotations \ android-support-v4 \ SettingsLib -else -LOCAL_RESOURCE_DIR += $(call my-dir)/res - - -## Include transitive dependencies below - -# Include support-v7-appcompat, if not already included -ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat -endif - -# Include support-v7-recyclerview, if not already included -ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview -endif - -# Include android-support-v7-preference, if not already included -ifeq (,$(findstring android-support-v7-preference,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference -endif - -# Include android-support-v14-preference, if not already included -ifeq (,$(findstring android-support-v14-preference,$(LOCAL_STATIC_JAVA_LIBRARIES))) -LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res -LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference -endif - -LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.settingslib - -LOCAL_STATIC_JAVA_LIBRARIES += \ - android-support-annotations \ - android-support-v4 \ - SettingsLib -endif