Merge "Don't include data resources when running R8" am: 75e1c77f1b

am: cfc4e3ec90 Change-Id: If8e63316a4ae7440e75820011e4435a759073363
2018-09-17 23:40:38 -07:00
parent 90e374d2e4 cfc4e3ec90
commit a60ee3f917
1 changed files with 1 additions and 0 deletions
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2821,6 +2821,7 @@ define transform-jar-to-dex-r8
 $(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY)
 $(hide) $(R8_COMPAT_PROGUARD) -injars '$<' \
    --min-api $(PRIVATE_MIN_SDK_VERSION) \
+    --no-data-resources \
    --force-proguard-compatibility --output $(subst classes.dex,,$@) \
    $(PRIVATE_PROGUARD_FLAGS) \
    $(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR)) \