From be80acfd1a77fd9073f43791f5b0dd06a5318b14 Mon Sep 17 00:00:00 2001 From: Lev Rumyantsev Date: Wed, 9 Aug 2017 10:57:33 -0700 Subject: [PATCH] Move default native bridge value to build.prop Before this change it was part of default.prop, which is applied before init.rc is executed, so that scripts cannot override the property. In contrast, build.prop is applied at "init-late" stage, so that one has a chance to override the property in scripts using "init" or "init-early" triggers. (cherry-picked from 74b2da9db67f5da2195c9b07dab22c868934e396) Test: fugu still works Bug: 63133475 Merged-In: I0842abaaec1d353ebe4debda6dfe3e2c42146786 Change-Id: I0842abaaec1d353ebe4debda6dfe3e2c42146786 --- target/product/runtime_libart.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 24eeff911..50b90acc5 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -61,12 +61,14 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ 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))