diff options
| author | 2016-12-21 18:37:25 +0000 | |
|---|---|---|
| committer | 2016-12-21 18:37:29 +0000 | |
| commit | fbe70a3e93ddf4e227f9529d482acf45cdf4d1c7 (patch) | |
| tree | 7452a51a0e55dbafa9faade6f035c22b07f36542 | |
| parent | b9606a5d09d943a7f3c1b2b22d4c465d91113b83 (diff) | |
| parent | 77a51d12744e81c63b1c16d7bd00d93de6faedd7 (diff) | |
Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev
| -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 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) ######################################################################### |