diff options
| author | 2016-12-21 18:44:08 +0000 | |
|---|---|---|
| committer | 2016-12-21 18:44:08 +0000 | |
| commit | b0d5ade11cae4eda6e58d2928afcdccd08e4e86b (patch) | |
| tree | 65be4da7a355b1a19bbc853e6bb44986742067a4 | |
| parent | 5887b6d7b5fa644bd57c6a1fde4666ca46e77019 (diff) | |
| parent | 77a51d12744e81c63b1c16d7bd00d93de6faedd7 (diff) | |
Enable multi-dex for coverage builds to fix breakage
am: 77a51d1274
Change-Id: Ife18d443d4c6a7ffcdb183cee3f7317efafbab38
| -rw-r--r-- | services/tests/servicestests/Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index a343b842e083..fcc364ec3e58 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) ######################################################################### |