Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable multi-dex for dx

Browse Source 
am: 6b13ebc7f1

Change-Id: I78486dd1d460673ae25c80994b474cf8a044b660
This commit is contained in:
Colin Cross
2017-07-27 19:38:35 +00:00
committed by android-build-merger
parent b6c4ccb724 6b13ebc7f1
commit 5853282fa0
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/tests/notification/Android.mk
View File

@@ -29,6 +29,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
@@ -52,9 +53,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)