From 77a51d12744e81c63b1c16d7bd00d93de6faedd7 Mon Sep 17 00:00:00 2001 From: Allen Hair Date: Thu, 22 Sep 2016 09:58:06 -0700 Subject: Enable multi-dex for coverage builds to fix breakage Test: m PRODUCT-bullhead-userdebug showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests Change-Id: I6a324cbd0dc078ad2903345a069385d9f0d179ff (cherry picked from commit aeaee4c5fe9a71949ddd701f2590559819bfe072) --- services/tests/servicestests/Android.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index ce0a33453e3e..7886b5e9e395 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -47,6 +47,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) ######################################################################### -- cgit v1.2.3-59-g8ed1b