diff options
| author | Yohann Roussel <yroussel@google.com> | 2016-03-16 10:33:02 +0100 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2016-03-18 16:03:00 +0100 |
| commit | 2ae244c5784b8fe853d040a0ed54742fb8825979 (patch) | |
| tree | 976996547d9291e2f99ccb9f6b571a927e8a4784 /core/java.mk | |
| parent | 1a662f48c3e18583fd8cba2dade94aa44e5f6e9b (diff) | |
| download | platform_build-2ae244c5784b8fe853d040a0ed54742fb8825979.tar.gz platform_build-2ae244c5784b8fe853d040a0ed54742fb8825979.tar.bz2 platform_build-2ae244c5784b8fe853d040a0ed54742fb8825979.zip | |
Remove rules for building dex with dx
This is just to ensure no dex file is built with dx any more, cleaning
of the build rules from Jack optionality is still to be done.
Bug: 27218410
(cherry picked from commit 22313f2b2a4aba8d284be4324233379d95886e23)
Change-Id: I1e7f2f5dcc7f95a44f5ebf2e4ba99931ff3ba014
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java.mk b/core/java.mk index e8bdc5277e..64140fb32f 100644 --- a/core/java.mk +++ b/core/java.mk @@ -613,8 +613,6 @@ $(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS) ifeq ($(LOCAL_EMMA_INSTRUMENT),true) $(built_dex_intermediate): PRIVATE_DX_FLAGS += --no-locals endif -$(built_dex_intermediate): $(full_classes_proguard_jar) $(DX) - $(transform-classes.jar-to-dex) endif # LOCAL_JACK_ENABLED is disabled $(built_dex): $(built_dex_intermediate) | $(ACP) |