From cf5a8b16edbdeffb6660c113a1aff72632238f5e Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Fri, 25 Jan 2019 09:16:28 -0800
Subject: [PATCH] Enable resolution of startup const-string for non user builds

Bug: 116059983
Bug: 111397239
Test: make
Change-Id: I82dec2041e7cb83897bd7ed7125631c39a4af85a
---
 target/product/runtime_libart.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 9057e32ca..26ddeca03 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -87,6 +87,15 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     pm.dexopt.inactive=verify \
     pm.dexopt.shared=speed
 
+# Currently for all non-user builds only.
+ifneq (user,$(TARGET_BUILD_VARIANT))
+
+# Enable resolution of startup const strings.
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
+    dalvik.vm.dex2oat-resolve-startup-strings=true
+
+endif
+
 # Enable minidebuginfo generation unless overridden.
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     dalvik.vm.minidebuginfo=true \