Merge "Enable multi-dex for coverage builds to fix breakage"

This commit is contained in:
TreeHugger Robot
2016-09-23 19:39:57 +00:00
committed by Android (Google) Code Review

View File

@@ -48,6 +48,11 @@ LOCAL_JNI_SHARED_LIBRARIES := libservicestestsjni \
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)
#########################################################################