Merge "Remove --no-locals -> --release translation"

am: d84332eed6

Change-Id: I448d47a81efb31537d976c84cbe38031507f89f5
This commit is contained in:
Colin Cross 2017-12-22 02:00:53 +00:00 committed by android-build-merger
commit 9f8b5703b3
1 changed files with 1 additions and 2 deletions

View File

@ -2421,8 +2421,7 @@ $(hide) $(DX_COMMAND) \
--output $(dir $@) \ --output $(dir $@) \
--min-api $(PRIVATE_MIN_SDK_VERSION) \ --min-api $(PRIVATE_MIN_SDK_VERSION) \
$(subst --main-dex-list=, --main-dex-list , \ $(subst --main-dex-list=, --main-dex-list , \
$(subst --no-locals, --release, \ $(filter-out --core-library --multi-dex --minimal-main-dex,$(PRIVATE_DX_FLAGS))) \
$(filter-out --core-library --multi-dex --minimal-main-dex,$(PRIVATE_DX_FLAGS)))) \
$(dir $@)d8_input.jar $(dir $@)d8_input.jar
$(hide) rm -f $(dir $@)d8_input.jar $(hide) rm -f $(dir $@)d8_input.jar
endef endef