X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=nativebridge%2Fnativebridge.mk;h=c8641a2f4202a41daebf8ac2af9206232a354f81;hb=a304d801195f485522f2acd325f1805b2c24d3ab;hp=6a56095c7c344f8a27310bd82536a8a60ffad37c;hpb=a678bc15deaf4727b1f8c723b49ba57ca03bbb8a;p=android-x86%2Fdevice-generic-common.git

diff --git a/nativebridge/nativebridge.mk b/nativebridge/nativebridge.mk
index 6a56095..c8641a2 100644
--- a/nativebridge/nativebridge.mk
+++ b/nativebridge/nativebridge.mk
@@ -23,8 +23,16 @@ PRODUCT_PROPERTY_OVERRIDES := \
     ro.dalvik.vm.isa.arm=x86 \
     ro.enable.native.bridge.exec=1 \
 
+ifeq ($(TARGET_SUPPORTS_64_BIT_APPS),true)
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.dalvik.vm.isa.arm64=x86_64 \
+    ro.enable.native.bridge.exec64=1
+endif
+
+ifneq ($(HOUDINI_PREINSTALL),intel)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES := ro.dalvik.vm.native.bridge=libnb.so
 
 PRODUCT_PACKAGES := libnb
+endif
 
 $(call inherit-product-if-exists,vendor/intel/houdini/houdini.mk)