diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 97d8bdd87543c..48937ae32add2 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -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) #########################################################################