commit 76e2b22796eebda33b3bbd2aff57229a685e24c4
author Lev Rumyantsev <levarum@google.com> Thu Aug 31 22:20:58 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 31 22:20:58 2017 +0000
tree 0b5a10e4111f500a144fd4a174ea4ef297f870ee
parent 40403cddedbbba8bb368995f256f517b2add0cbc
parent 77492a72a22faf2f111bb00699c7e4c30ce4bcd9

Merge "Move default native bridge value to build.prop" am: e7a0516835
am: 77492a72a2

Change-Id: I40565e0df3718cb326b810a59372e4ebdaeeadf7

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 24eeff9..50b90ac 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -61,12 +61,14 @@
     dalvik.vm.image-dex2oat-Xmx=64m \
     dalvik.vm.dex2oat-Xms=64m \
     dalvik.vm.dex2oat-Xmx=512m \
-    ro.dalvik.vm.native.bridge=0 \
     dalvik.vm.usejit=true \
     dalvik.vm.usejitprofiles=true \
     dalvik.vm.dexopt.secondary=true \
     dalvik.vm.appimageformat=lz4
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.dalvik.vm.native.bridge=0
+
 # Different dexopt types for different package update/install times.
 # On eng builds, make "boot" reasons only extract for faster turnaround.
 ifeq (eng,$(TARGET_BUILD_VARIANT))