Merge "Don't include data resources when running R8"

This commit is contained in:
Søren Gjesse
2018-09-18 06:22:21 +00:00
committed by Gerrit Code Review

View File

@@ -2821,6 +2821,7 @@ define transform-jar-to-dex-r8
$(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY) $(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY)
$(hide) $(R8_COMPAT_PROGUARD) -injars '$<' \ $(hide) $(R8_COMPAT_PROGUARD) -injars '$<' \
--min-api $(PRIVATE_MIN_SDK_VERSION) \ --min-api $(PRIVATE_MIN_SDK_VERSION) \
--no-data-resources \
--force-proguard-compatibility --output $(subst classes.dex,,$@) \ --force-proguard-compatibility --output $(subst classes.dex,,$@) \
$(PRIVATE_PROGUARD_FLAGS) \ $(PRIVATE_PROGUARD_FLAGS) \
$(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR)) \ $(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR)) \