diff options
| -rw-r--r-- | packages/EasterEgg/Android.mk | 10 | ||||
| -rw-r--r-- | packages/SettingsLib/common.mk | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/integ/Android.mk | 2 | ||||
| -rw-r--r-- | packages/SettingsLib/tests/robotests/Android.mk | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/packages/EasterEgg/Android.mk b/packages/EasterEgg/Android.mk index d4c1e7094b99..a8255813985f 100644 --- a/packages/EasterEgg/Android.mk +++ b/packages/EasterEgg/Android.mk @@ -2,17 +2,23 @@ LOCAL_PATH:= $(call my-dir) 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_CERTIFICATE := platform diff --git a/packages/SettingsLib/common.mk b/packages/SettingsLib/common.mk index 49c5467d03e0..9d1c4ca8ec7e 100644 --- a/packages/SettingsLib/common.mk +++ b/packages/SettingsLib/common.mk @@ -21,6 +21,10 @@ LOCAL_STATIC_JAVA_LIBRARIES += \ 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 7ace048324c3..3c8c8acee9b1 100644 --- a/packages/SettingsLib/tests/integ/Android.mk +++ b/packages/SettingsLib/tests/integ/Android.mk @@ -27,6 +27,8 @@ LOCAL_JACK_FLAGS := --multi-dex native 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 bc1a834535a6..273802754bbb 100644 --- a/packages/SettingsLib/tests/robotests/Android.mk +++ b/packages/SettingsLib/tests/robotests/Android.mk @@ -28,6 +28,8 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res +LOCAL_USE_AAPT2 := true + include frameworks/base/packages/SettingsLib/common.mk include $(BUILD_PACKAGE) |