| commit | 41df109aca81726554d2aedf4ebea6c98f663273 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Tue Dec 05 16:20:43 2017 -0800 |
| committer | Aurimas Liutikas <aurimas@google.com> | Thu Dec 07 23:25:48 2017 +0000 |
| tree | 40b5bc2eae18a4adb6f33dfbadfd57a66149f60a | |
| parent | 6e15c2a89ae9733d2552d9d0a20504a4bdf69c29 [diff] |
Move SettingsLib tests and EasterEgg to aapt2. Test: make -j SettingsLibTests Change-Id: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 49c5467..9d1c4ca 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk
@@ -21,6 +21,10 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \ android-support-v4 \ apptoolkit-lifecycle-runtime \ + android-support-v7-recyclerview \ + android-support-v7-preference \ + android-support-v7-appcompat \ + android-support-v14-preference \ SettingsLib else LOCAL_RESOURCE_DIR += $(call my-dir)/res
diff --git a/packages/SettingsLib/tests/integ/Android.mk b/packages/SettingsLib/tests/integ/Android.mk index 7ace048..3c8c8ac 100644 --- a/packages/SettingsLib/tests/integ/Android.mk +++ b/packages/SettingsLib/tests/integ/Android.mk
@@ -27,6 +27,8 @@ LOCAL_PACKAGE_NAME := SettingsLibTests LOCAL_COMPATIBILITY_SUITE := device-tests +LOCAL_USE_AAPT2 := true + LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ espresso-core \
diff --git a/packages/SettingsLib/tests/robotests/Android.mk b/packages/SettingsLib/tests/robotests/Android.mk index bc1a834..2738027 100644 --- a/packages/SettingsLib/tests/robotests/Android.mk +++ b/packages/SettingsLib/tests/robotests/Android.mk
@@ -28,6 +28,8 @@ LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res +LOCAL_USE_AAPT2 := true + include frameworks/base/packages/SettingsLib/common.mk include $(BUILD_PACKAGE)