summaryrefslogtreecommitdiffstats
path: root/target/product
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2014-08-27 15:58:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-27 15:58:44 +0000
commitcf4e6a722c22eb333a1520847052e54901531541 (patch)
treea1e550f1afda716222b9f532b970d4ee00ac1122 /target/product
parent9e59e66373a68782179f5522d125c8617ecd92a6 (diff)
parent8078df9755fc0942feae8ac10a4965c5de4968a8 (diff)
downloadbuild-cf4e6a722c22eb333a1520847052e54901531541.zip
build-cf4e6a722c22eb333a1520847052e54901531541.tar.gz
build-cf4e6a722c22eb333a1520847052e54901531541.tar.bz2
am 8078df97: Merge "Make sure that ro.dalvik.vm.native.bridge is always set."
* commit '8078df9755fc0942feae8ac10a4965c5de4968a8': Make sure that ro.dalvik.vm.native.bridge is always set.
Diffstat (limited to 'target/product')
-rw-r--r--target/product/runtime_libart.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 8f5f24d..e4200b3 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -28,5 +28,6 @@ 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 \
include $(SRC_TARGET_DIR)/product/runtime_common.mk