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

Commit 341d6a15 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Migrate to AAPT2" into pi-dev

parents fe791132 26f8daa6

tests/Android.mk

+20 −15
Original line number Diff line number Diff line
@@ -19,12 +19,17 @@ include $(CLEAR_VARS) 


LOCAL_STATIC_JAVA_LIBRARIES := \

    android-ex-camera2 \

        android-support-v4 \

        android-support-test \

    guava \

    mockito-target \

    android-support-test \

    platform-test-annotations



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-core-ui \

    android-support-core-utils \

    android-support-compat \

    android-support-fragment



LOCAL_SRC_FILES := \

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

    $(call all-java-files-under, ../src) \
@@ -36,7 +41,7 @@ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors 


LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/res \

    $(LOCAL_PATH)/../res \

    $(LOCAL_PATH)/../res



LOCAL_JAVA_LIBRARIES := \

    android.test.mock \
@@ -48,7 +53,7 @@ LOCAL_USE_AAPT2 := true 


LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages com.android.server.telecom:android.support.compat

    --extra-packages com.android.server.telecom



LOCAL_JACK_FLAGS := --multi-dex native