commit 1c5143e32f85c028fb140b73ba7111bd8a333c18
author Colin Cross <ccross@android.com> Wed Mar 15 21:29:02 2017 -0700
committer Colin Cross <ccross@android.com> Thu Mar 16 15:18:01 2017 +0000
tree 31683d7029431b009300d45ca552261779258fe8
parent 41e604aac001ef023ad61f672239b76ccf33489b

Revert "Remove obsolete LOCAL_DX_FLAGS."

This reverts commit fbe160b29292fae8865431d544e66adabe2e1188.

Test: m -j ANDROID_COMPILE_WITH_JACK=false test-art-host
Change-Id: I76008336169b11ee1637101f69bdc4ffc8670c8a

build/Android.common_test.mk

diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk
index 27ec8b3..1876efc 100644
--- a/build/Android.common_test.mk
+++ b/build/Android.common_test.mk
@@ -215,6 +215,7 @@
     LOCAL_MODULE_PATH := $(3)
     LOCAL_DEX_PREOPT_IMAGE_LOCATION := $(TARGET_CORE_IMG_OUT)
     ifneq ($(wildcard $(LOCAL_PATH)/$(2)/main.list),)
+      LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(LOCAL_PATH)/$(2)/main.list --minimal-main-dex
       LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true -D jack.preprocessor.file=$(LOCAL_PATH)/$(2)/main.jpp
     endif
     include $(BUILD_JAVA_LIBRARY)
@@ -230,6 +231,7 @@
     LOCAL_JAVA_LIBRARIES := $(HOST_CORE_JARS)
     LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_LOCATION)
     ifneq ($(wildcard $(LOCAL_PATH)/$(2)/main.list),)
+      LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(LOCAL_PATH)/$(2)/main.list --minimal-main-dex
       LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true -D jack.preprocessor.file=$(LOCAL_PATH)/$(2)/main.jpp
     endif
     include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)