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

Merge "Move SettingsLib tests and EasterEgg to aapt2."

Browse Source
This commit is contained in:
android-build-prod (mdb)
2018-05-07 20:05:54 +00:00
committed by Gerrit Code Review
parent 3e20d23cf7 5e81f7cf67
commit 846fbd0806
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)