Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf93b967 authored by android-build-prod (mdb)'s avatar android-build-prod (mdb) Committed by android-build-merger
Browse files

Merge "Move SettingsLib tests and EasterEgg to aapt2." 

am: 846fbd08

Change-Id: I4d616697988a569b53d0dec1e4b674e455ae1307
parents a804215d 846fbd08

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

packages/SettingsLib/tests/integ/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 \

packages/SettingsLib/tests/robotests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)