From c81798f2a28b5c6b0929c0fae4af6386e796fe69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Fri, 14 Sep 2018 15:17:00 +0200
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

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