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

Commit d4afe618 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Remove reference to support-v4-prebuilt" into oc-dev am: 04d2710c 

am: f63cc673

Change-Id: I8436636456a23ac38b577d5f0af179051960d3dc
parents 96f9dd17 f63cc673

tests/Android.mk

+3 −2
Original line number Original line Diff line number Diff line
@@ -37,7 +37,8 @@ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors 




LOCAL_RESOURCE_DIR := \

LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/res \

    $(LOCAL_PATH)/res \

    $(LOCAL_PATH)/../res

    $(LOCAL_PATH)/../res \

    $(SUPPORT_LIBRARY_ROOT)/compat/res





LOCAL_JAVA_LIBRARIES := \

LOCAL_JAVA_LIBRARIES := \

        android.test.runner \

        android.test.runner \
@@ -45,7 +46,7 @@ LOCAL_JAVA_LIBRARIES := \ 




LOCAL_AAPT_FLAGS := \

LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --auto-add-overlay \

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

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





LOCAL_JACK_FLAGS := --multi-dex native

LOCAL_JACK_FLAGS := --multi-dex native