Merge "Use debug mode when running R8 for eng builds." am: 58b7f7480f am: 2623318e10

am: 64f54d3991

Change-Id: Iaf3b88bfa92ac42e7a22e88b31cf64e3b61b015f
This commit is contained in:
Jaewoong Jung 2018-12-03 07:58:47 -08:00 committed by android-build-merger
commit 594e6b0d0e
1 changed files with 9 additions and 0 deletions

View File

@ -2738,6 +2738,14 @@ endef
###########################################################
## 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
@echo R8: $@
$(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY)
@ -2745,6 +2753,7 @@ $(hide) $(R8_COMPAT_PROGUARD) -injars '$<' \
--min-api $(PRIVATE_MIN_SDK_VERSION) \
--no-data-resources \
--force-proguard-compatibility --output $(subst classes.dex,,$@) \
$(R8_DEBUG_MODE) \
$(PRIVATE_PROGUARD_FLAGS) \
$(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR)) \
$(PRIVATE_DX_FLAGS)