Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev

Browse Source
This commit is contained in:
Daniel Nishi
2016-12-21 18:37:25 +00:00
committed by Android (Google) Code Review
parent b9606a5d09 77a51d1274
commit fbe70a3e93
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/tests/servicestests/Android.mk
View File

@@ -47,6 +47,11 @@ LOCAL_JNI_SHARED_LIBRARIES := libservicestestsjni \
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
# Code coverage puts us over the dex limit, so enable multi-dex for coverage-enabled builds
ifeq (true,$(EMMA_INSTRUMENT))
LOCAL_JACK_FLAGS := --multi-dex native
endif # EMMA_INSTRUMENT_STATIC
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
######################################################################### #########################################################################