From 42ce38236a14fd854ff22c8747851863fc2f3ff6 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Thu, 31 Jan 2019 09:52:51 -0800
Subject: [PATCH] Remove USER exclusion for
 dalvik.vm.dex2oat-resolve-startup-strings

Aims to have more consistency between user and userdebug builds.

Bug: 116059983
Test: make

Change-Id: I4f8bdbdd9c3983d04d956a4993d9de60f5f60664
---
 target/product/runtime_libart.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 26ddeca03f..4aad5f70e9 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -87,15 +87,10 @@ 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 \