commit 97adeb16aa08a4d0e8b63aea38607c179e808d18
author Mathieu Chartier <mathieuc@google.com> Wed Jan 30 14:50:36 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 30 14:50:36 2019 -0800
tree 4f71ce2006258dd62428730c48a1469ae6ef5f9c
parent cc41430a8bd45d6f33fcecef44fe3461803e2ffe
parent 47200d864ffea0e85177b53f77e1774f4d88ed24

Merge "Enable resolution of startup const-string for non user builds" am: 8fdf4e0f5b
am: 47200d864f

Change-Id: Id7a591e576983461d0a70da731d565a4dcd5d23a

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 9057e32..26ddeca 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -87,6 +87,15 @@
     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 \