commit 72909f45f7ed2e93a5b7074573e16b3e00767049
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 23 19:39:57 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 23 19:39:59 2016 +0000
tree 0134bf9eb113303ad47427981b9b5d5dc0ca9928
parent abe2195b8b45ac7017ae88c9ef4f9d21e4c29d0a
parent aeaee4c5fe9a71949ddd701f2590559819bfe072

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

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)
 
 #########################################################################