commit c81798f2a28b5c6b0929c0fae4af6386e796fe69
author Søren Gjesse <sgjesse@google.com> Fri Sep 14 15:17:00 2018 +0200
committer Søren Gjesse <sgjesse@google.com> Fri Sep 14 15:26:44 2018 +0200
tree b672a6658558d1ba079632779a04776f3b3fce93
parent 3ea8ca5ac7d11684bf7030d1f1ddab93f59946a9

Don't include data resources when running R8

The change https://r8-review.googlesource.com/c/r8/+/26482 made R8
process data resources by default. This is not expected for the
Android Platform build

Test: m -j PRODUCT-aosp_x86-userdebug core-oj
Change-Id: I8936a39ea3cc0f46e455087076635a8fa2c9e0d3

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index cf6e0a4..166b6c2 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2836,6 +2836,7 @@
 $(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)) \