commit 40b28aa9cd75b9a2f7cc8d2e9418de4ed1302c9b
author Colin Cross <ccross@android.com> Mon Feb 11 13:52:45 2019 -0800
committer Colin Cross <ccross@android.com> Mon Feb 11 15:28:37 2019 -0800
tree 31819253bb269cbb95444c49a6e03e5a8af0263d
parent 61a9328e807426636d3e29699cd978d4a7a345c0

Remove typo'd variables

LOCAL_DEX_PREOPT_IMAGE_LOCATION := $(TARGET_CORE_IMG_OUT) doesn't
do anything because TARGET_CORE_IMG_OUT is never set.

LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_LOCATION) doesn't do
anything because nothing reads LOCAL_DEX_PREOPT_IMAGE.

Neither seems useful with LOCAL_DEX_PREOPT := false.

Test: m checkbuild
Change-Id: I26c0a848e15784c4dad6f8c3bb6786b98ac85c20

build/Android.common_test.mk

diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk
index 12eae89..55b8ae2 100644
--- a/build/Android.common_test.mk
+++ b/build/Android.common_test.mk
@@ -127,7 +127,6 @@
     LOCAL_MODULE_TAGS := tests
     LOCAL_JAVA_LIBRARIES := $(TARGET_TEST_CORE_JARS)
     LOCAL_MODULE_PATH := $(3)
-    LOCAL_DEX_PREOPT_IMAGE_LOCATION := $(TARGET_CORE_IMG_OUT)
     ifneq ($(wildcard $(LOCAL_PATH)/$(2)/main.list),)
       LOCAL_MIN_SDK_VERSION := 19
       LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(LOCAL_PATH)/$(2)/main.list --minimal-main-dex
@@ -143,7 +142,6 @@
     LOCAL_DEX_PREOPT := false
     LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_test.mk $(4)
     LOCAL_JAVA_LIBRARIES := $(HOST_TEST_CORE_JARS)
-    LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_LOCATION)
     ifneq ($(wildcard $(LOCAL_PATH)/$(2)/main.list),)
       LOCAL_MIN_SDK_VERSION := 19
       LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(LOCAL_PATH)/$(2)/main.list --minimal-main-dex