commit 11bd1b601e1580e8a41cc08853fae4a8727c269b
author Alan Viverette <alanv@google.com> Sat Mar 31 02:11:59 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 31 02:11:59 2018 +0000
tree 1cfd4735108dfeb519476a6c073255aff0a6f9af
parent 53f60f60ee0f18d4b4249496d6491b14dd3a99f2
parent e3264ba6cf7df5b33b10dd6a15ac5010c78bac6e

Merge "Migrate to AAPT2" into pi-dev

packages/SettingsLib/Android.mk

diff --git a/packages/SettingsLib/Android.mk b/packages/SettingsLib/Android.mk
index 859f86f..5a8be31 100644
--- a/packages/SettingsLib/Android.mk
+++ b/packages/SettingsLib/Android.mk
@@ -3,6 +3,8 @@
 
 LOCAL_USE_AAPT2 := true
 
+LOCAL_AAPT2_ONLY := true
+
 LOCAL_MODULE := SettingsLib
 
 LOCAL_JAVA_LIBRARIES := \

packages/SettingsLib/common.mk

diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk
index 28f97d1..5de3a6e 100644
--- a/packages/SettingsLib/common.mk
+++ b/packages/SettingsLib/common.mk
@@ -13,7 +13,6 @@
 #   include frameworks/base/packages/SettingsLib/common.mk
 #
 
-ifeq ($(LOCAL_USE_AAPT2),true)
 LOCAL_STATIC_JAVA_LIBRARIES += \
     android-support-annotations \
     android-arch-lifecycle-common
@@ -26,45 +25,4 @@
     android-support-v7-appcompat \
     android-support-v14-preference \
     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 += prebuilts/sdk/current/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 += prebuilts/sdk/current/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 += prebuilts/sdk/current/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_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 \
-    android-arch-lifecycle-runtime \
-    android-arch-lifecycle-common \
-    SettingsLib
-endif