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

Commit 38e89667 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Build SystemUI and Keyguard with AAPT2 

Bug:29462255
Change-Id: I0bd6da7da21927d185ff230c81aac390cfa8029d
parent ec6f6c86

packages/Keyguard/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-subdir-Iaidl-files)



LOCAL_MODULE := Keyguard
@@ -30,6 +32,8 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags 


LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_JAR_EXCLUDE_FILES := none



include $(BUILD_STATIC_JAVA_LIBRARY)



#include $(call all-makefiles-under,$(LOCAL_PATH))

packages/Keyguard/test/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := KeyguardTest

packages/Keyguard/test/SampleTrustAgent/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := SampleTrustAgent
@@ -27,6 +29,6 @@ LOCAL_MODULE_TAGS := tests 


# LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4

LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v4



include $(BUILD_PACKAGE)

packages/SystemUI/Android.mk

+6 −15
Original line number Diff line number Diff line
@@ -16,17 +16,21 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 


include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-Iaidl-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_ANDROID_LIBRARIES := \

    Keyguard \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference \

    android-support-v17-leanback \

    android-support-v17-leanback



LOCAL_STATIC_JAVA_LIBRARIES := \

    framework-protos \

    SystemUI-proto-tags
@@ -39,19 +43,6 @@ LOCAL_PRIVILEGED_MODULE := true 


LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_RESOURCE_DIR := \

    frameworks/base/packages/Keyguard/res \

    $(LOCAL_PATH)/res \

    frameworks/support/v7/preference/res \

    frameworks/support/v14/preference/res \

    frameworks/support/v7/appcompat/res \

    frameworks/support/v7/recyclerview/res \

    frameworks/support/v17/leanback/res



LOCAL_AAPT_FLAGS := --auto-add-overlay \

    --extra-packages com.android.keyguard:android.support.v7.recyclerview:android.support.v7.preference:android.support.v14.preference:android.support.v7.appcompat \

    --extra-packages android.support.v17.leanback



ifneq ($(SYSTEM_UI_INCREMENTAL_BUILDS),)

    LOCAL_PROGUARD_ENABLED := disabled

    LOCAL_JACK_ENABLED := incremental

packages/SystemUI/tests/Android.mk

+11 −16
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_MODULE_TAGS := tests



LOCAL_JACK_FLAGS := --multi-dex native
@@ -23,37 +24,31 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano 
LOCAL_PROTOC_FLAGS := -I$(LOCAL_PATH)/..

LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors



LOCAL_AAPT_FLAGS := --auto-add-overlay \

    --extra-packages com.android.systemui:com.android.keyguard:android.support.v14.preference:android.support.v7.preference:android.support.v7.appcompat:android.support.v7.recyclerview \

    --extra-packages android.support.v17.leanback

LOCAL_PACKAGE_NAME := SystemUITests



LOCAL_SRC_FILES := $(call all-java-files-under, src) \

    $(call all-Iaidl-files-under, src) \

    $(call all-java-files-under, ../src)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \

    frameworks/support/v7/preference/res \

    frameworks/support/v14/preference/res \

    frameworks/support/v7/appcompat/res \

    frameworks/support/v7/recyclerview/res \

    frameworks/support/v17/leanback/res \

    frameworks/base/packages/SystemUI/res \

    frameworks/base/packages/Keyguard/res



LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.car



LOCAL_PACKAGE_NAME := SystemUITests



LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

LOCAL_STATIC_ANDROID_LIBRARIES := \

    Keyguard \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference \

    android-support-v17-leanback \

    android-support-v17-leanback



LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-target \

    SystemUI-proto-tags



LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.car



LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui



# sign this with platform cert, so this test is allowed to inject key events into

# UI it doesn't own. This is necessary to allow screenshots to be taken

LOCAL_CERTIFICATE := platform