Use debug mode when running R8 for eng builds.

Bug: 119601874
Test: Built for different variants.
Change-Id: Icaf300c944b1d0594f524a11999cc5a8229919eb
This commit is contained in:
Jaewoong Jung 2018-11-28 15:19:46 -08:00
parent 638ca85aec
commit b3113da542
1 changed files with 9 additions and 0 deletions

View File

@ -2752,6 +2752,14 @@ endef
########################################################### ###########################################################
## Commands to call R8 ## Commands to call R8
########################################################### ###########################################################
# Use --debug flag for eng builds by default
ifeq (eng,$(TARGET_BUILD_VARIANT))
R8_DEBUG_MODE := --debug
else
R8_DEBUG_MODE :=
endif
define transform-jar-to-dex-r8 define transform-jar-to-dex-r8
@echo R8: $@ @echo R8: $@
$(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY) $(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY)
@ -2759,6 +2767,7 @@ $(hide) $(R8_COMPAT_PROGUARD) -injars '$<' \
--min-api $(PRIVATE_MIN_SDK_VERSION) \ --min-api $(PRIVATE_MIN_SDK_VERSION) \
--no-data-resources \ --no-data-resources \
--force-proguard-compatibility --output $(subst classes.dex,,$@) \ --force-proguard-compatibility --output $(subst classes.dex,,$@) \
$(R8_DEBUG_MODE) \
$(PRIVATE_PROGUARD_FLAGS) \ $(PRIVATE_PROGUARD_FLAGS) \
$(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR)) \ $(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR)) \
$(PRIVATE_DX_FLAGS) $(PRIVATE_DX_FLAGS)