commit 5ff3ad6312086b87439bd8d3438a4476e2c14946
author Adam Lesinski <adamlesinski@google.com> Wed Apr 13 20:30:45 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Thu Apr 14 14:45:21 2016 -0700
tree 81677b94eef85b71fd2789a44a9e1d810708a779
parent b5abb78b7c329069d5d5e7fd9c6a6e5e81f79c90

SettingsLib: Build with AAPT2

Bug:22775504
Change-Id: I2e5015235384d124418d32186daa190f38e1c5b3

packages/SettingsLib/common.mk

diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk
index b017047..cf0ba6c 100644
--- a/packages/SettingsLib/common.mk
+++ b/packages/SettingsLib/common.mk
@@ -13,6 +13,16 @@
 #   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
 LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.settingslib
-LOCAL_STATIC_JAVA_LIBRARIES += SettingsLib
+LOCAL_STATIC_JAVA_LIBRARIES += \
+    android-support-annotations \
+    android-support-v4 \
+    SettingsLib
+endif