From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Fri, 15 Jul 2016 03:06:24 +0000 (+0800)
Subject: houdini: support Intel's implementation
X-Git-Tag: android-x86-6.0-r1~3
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=baf6eb9c52cbb30b8e2ab2bd483f1728f64cd696

houdini: support Intel's implementation

NO_REF_TASK
Tested: pass all test cases of check_houdini.sh

Change-Id: I37ed20cec5354575671f3ea58c0b041774fa6dae
---

diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index 70fe1cd..18a06db 100644
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -44,6 +44,7 @@ fi
 
 cd $binfmt_misc_dir
 if [ -e register ]; then
+	[ -e /system/bin/houdini$1 ] && dest_dir=/system/bin
 	# register Houdini for arm binaries
 	if [ -z "$1" ]; then
 		echo ':arm_exe:M::\\x7f\\x45\\x4c\\x46\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x28::'"$dest_dir/houdini:P" > register
diff --git a/nativebridge/nativebridge.mk b/nativebridge/nativebridge.mk
index 09edeab..c8641a2 100644
--- a/nativebridge/nativebridge.mk
+++ b/nativebridge/nativebridge.mk
@@ -29,8 +29,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
     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)