diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-01-15 09:09:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-15 09:09:47 +0000 |
| commit | 2826cb961ba5d788c8e8e84e7882d359875453cf (patch) | |
| tree | 9e67deff5ef0b6b82b91cb9cfa069fdf38db8306 /core/java.mk | |
| parent | 1ea1d64771c4b175b721bc8612cac3acd11c8cb7 (diff) | |
| parent | 138768c1bbb49d549c4b14281fa5f0bffac7d933 (diff) | |
| download | build-2826cb961ba5d788c8e8e84e7882d359875453cf.zip build-2826cb961ba5d788c8e8e84e7882d359875453cf.tar.gz build-2826cb961ba5d788c8e8e84e7882d359875453cf.tar.bz2 | |
Merge "Remove some useless depencies"
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java.mk b/core/java.mk index 0fba710..c29d587 100644 --- a/core/java.mk +++ b/core/java.mk @@ -512,7 +512,7 @@ $(full_classes_proguard_jar) : $(full_classes_jar) endif # LOCAL_PROGUARD_ENABLED defined - +ifneq ($(strip $(LOCAL_USE_JACK)),true) # Override PRIVATE_INTERMEDIATES_DIR so that install-dex-debug # will work even when intermediates != intermediates.COMMON. $(built_dex_intermediate): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON) @@ -528,6 +528,7 @@ $(built_dex_intermediate): PRIVATE_DX_FLAGS += --no-locals endif $(built_dex_intermediate): $(full_classes_proguard_jar) $(DX) $(transform-classes.jar-to-dex) +endif # !LOCAL_USE_JACK $(built_dex): $(built_dex_intermediate) | $(ACP) @echo Copying: $@ |