Merge "Move SettingsLib tests and EasterEgg to aapt2." (a35cd81b) · Commits · e / os / android_frameworks_base

packages/EasterEgg/Android.mk

+8 −2

Original line number	Diff line number	Diff line
		@@ -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

+4 −0

Original line number	Diff line number	Diff line
		@@ -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

+2 −0

Original line number	Diff line number	Diff line
		@@ -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 \

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)