diff options
| author | 2017-07-27 19:46:07 +0000 | |
|---|---|---|
| committer | 2017-07-27 19:46:07 +0000 | |
| commit | cea12d8d4da70fa4dff71a8a4ae1e01cba3670cf (patch) | |
| tree | dddd34d4d83ab4390eccafd4378c98d56b2a4373 | |
| parent | 5165de5833c8baf9edec172a7156d440692479b5 (diff) | |
| parent | 5853282fa045e563b453effb071ce10071757ef5 (diff) | |
Enable multi-dex for dx am: 6b13ebc7f1
am: 5853282fa0
Change-Id: I7f7e5ed3a25e407f5ee5df1f1391014676673bdc
| -rw-r--r-- | services/tests/notification/Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/services/tests/notification/Android.mk b/services/tests/notification/Android.mk index 79f96fdc0314..597a5849a1a0 100644 --- a/services/tests/notification/Android.mk +++ b/services/tests/notification/Android.mk @@ -28,6 +28,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JACK_FLAGS := --multi-dex native +LOCAL_DX_FLAGS := --multi-dex LOCAL_PACKAGE_NAME := FrameworksNotificationTests LOCAL_COMPATIBILITY_SUITE := device-tests @@ -51,9 +52,4 @@ LOCAL_JNI_SHARED_LIBRARIES := \ 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) |