From c783b5065bdc6babde46be0ebf72d31a9d0631ed Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Tue, 26 Aug 2014 22:46:13 +0100
Subject: [PATCH] Make sure that ro.dalvik.vm.native.bridge is always set.

A value of "0" means that native bridge is disabled.

Bug: 17104449

(cherry picked from commit 4f703a7f9ffd9a0d0432401a3173533d695d2ae6)

Change-Id: I4ca379923996ea08828dea4b2cd2da045e3f8031
---
 target/product/runtime_libart.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 8f5f24dd6a..e4200b30fa 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