commit aeaee4c5fe9a71949ddd701f2590559819bfe072
author Allen Hair <allenhair@google.com> Thu Sep 22 09:58:06 2016 -0700
committer Allen Hair <allenhair@google.com> Fri Sep 23 10:48:47 2016 -0700
tree c8a6a3f0b81fcbbe4ba4a333427e9c758f6798e7
parent a08e68acb30732f2eac42f78dd3983d3401791c1

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

services/tests/servicestests/Android.mk

diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk
index 97d8bdd..48937ae 100644
--- a/services/tests/servicestests/Android.mk
+++ b/services/tests/servicestests/Android.mk
@@ -48,6 +48,11 @@
 
 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)
 
 #########################################################################