commit 846fbd08068690cdcc707a5b53768543a2224c94
author android-build-prod (mdb) <android-build-team-robot@google.com> Mon May 07 20:05:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 07 20:05:54 2018 +0000
tree dd50f716eab640212cfc8f3b736ef362a9229f02
parent 3e20d23cf7fe456db8ea5052155c67a492503de6
parent 5e81f7cf67a3169784d22b0bbe980134847496b3

Merge "Move SettingsLib tests and EasterEgg to aapt2."

packages/EasterEgg/Android.mk

diff --git a/packages/EasterEgg/Android.mk b/packages/EasterEgg/Android.mk
index dac3ed6..605a75d 100644
--- a/packages/EasterEgg/Android.mk
+++ b/packages/EasterEgg/Android.mk
@@ -2,17 +2,23 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
+
 LOCAL_STATIC_JAVA_LIBRARIES := \
+    jsr305
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4 \
     android-support-v13 \
     android-support-dynamic-animation \
     android-support-v7-recyclerview \
     android-support-v7-preference \
     android-support-v7-appcompat \
-    android-support-v14-preference \
-    jsr305
+    android-support-v14-preference
+
+LOCAL_USE_AAPT2 := true
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := EasterEgg
 LOCAL_PRIVATE_PLATFORM_APIS := true

packages/SettingsLib/tests/integ/Android.mk

diff --git a/packages/SettingsLib/tests/integ/Android.mk b/packages/SettingsLib/tests/integ/Android.mk
index 5bd9e4c..dd24be4 100644
--- a/packages/SettingsLib/tests/integ/Android.mk
+++ b/packages/SettingsLib/tests/integ/Android.mk
@@ -28,6 +28,8 @@
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_COMPATIBILITY_SUITE := device-tests
 
+LOCAL_USE_AAPT2 := true
+
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
     espresso-core \

packages/SettingsLib/tests/robotests/Android.mk

diff --git a/packages/SettingsLib/tests/robotests/Android.mk b/packages/SettingsLib/tests/robotests/Android.mk
index bc28863..f4ea258 100644
--- a/packages/SettingsLib/tests/robotests/Android.mk
+++ b/packages/SettingsLib/tests/robotests/Android.mk
@@ -29,6 +29,8 @@
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/res
 
+LOCAL_USE_AAPT2 := true
+
 include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)