diff options
| author | 2017-10-02 13:35:15 -0700 | |
|---|---|---|
| committer | 2017-10-02 14:09:14 -0700 | |
| commit | 822cf6a4d02e45050e117e2e6d15059ca09976df (patch) | |
| tree | 7d0ebd98903f474aff61e78875f5605672b793c7 /build/Android.common_test.mk | |
| parent | f67f115423c9ef5aa62a33c12670cd8f89457c9c (diff) | |
Delete jack support
Remove references to jack from makefiles. There are still
references in test scripts that will need to be cleaned up.
Bug: 65302138
Test: m -j test-art-host
Change-Id: I74026197013cad7a5d5977f9462221bc7b864f06
Diffstat (limited to 'build/Android.common_test.mk')
| -rw-r--r-- | build/Android.common_test.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build/Android.common_test.mk b/build/Android.common_test.mk index 1ae79ac8cd..37e6d4230d 100644 --- a/build/Android.common_test.mk +++ b/build/Android.common_test.mk @@ -202,9 +202,9 @@ endef # $(5): a make variable used to collate target dependencies, e.g ART_TEST_TARGET_OAT_HelloWorld_DEX # $(6): a make variable used to collate host dependencies, e.g ART_TEST_HOST_OAT_HelloWorld_DEX # -# If the input test directory contains a file called main.list and main.jpp, +# If the input test directory contains a file called main.list, # then a multi-dex file is created passing main.list as the --main-dex-list -# argument to dx and main.jpp for Jack. +# argument to dx. define build-art-test-dex ifeq ($(ART_BUILD_TARGET),true) include $(CLEAR_VARS) @@ -219,7 +219,6 @@ define build-art-test-dex 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) $(5) := $$(LOCAL_INSTALLED_MODULE) @@ -235,7 +234,6 @@ define build-art-test-dex 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) $(6) := $$(LOCAL_INSTALLED_MODULE) |