Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move SettingsLib tests and EasterEgg to aapt2.

Browse Source 
Test: make -j SettingsLibTests
Change-Id: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
Merged-In: I38fbd6af7eb5707d76fb930b4d685e30b26f45de
(cherry picked from commit 41df109aca)
This commit is contained in:
Aurimas Liutikas
2017-12-05 16:20:43 -08:00
committed by Colin Cross
parent 3e20d23cf7
commit 5e81f7cf67
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/EasterEgg/Android.mk
View File

@@ -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_PRIVATE_PLATFORM_APIS := true

2
packages/SettingsLib/tests/integ/Android.mk
View File

@@ -28,6 +28,8 @@ LOCAL_PACKAGE_NAME := SettingsLibTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_USE_AAPT2 := true
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
espresso-core \

2
packages/SettingsLib/tests/robotests/Android.mk
View File

@@ -29,6 +29,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)