提交: 0a89b37e726046f8954bfbb9749c59b577a812c7 - device-generic-common (git)

device/generic/common

Commit MetaInfo

• 修訂: 0a89b37e726046f8954bfbb9749c59b577a812c7 (tree)
• 時間: 2017-10-10 04:08:40
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

nativebridge: support houdini 7.1

Change Summary

• modified: init.x86.rc
• modified: nativebridge/Android.mk
• modified: nativebridge/bin/enable_nativebridge
• modified: nativebridge/src/libnb.cpp

差異

--- a/init.x86.rc
+++ b/init.x86.rc
@@ -100,7 +100,6 @@ on property:debug.logcat=1
     class_start debug
 
 on property:persist.sys.nativebridge=1
-    mkdir /data/arm 0775 system system
     start nativebridge
 
 on property:persist.sys.nativebridge=0

--- a/nativebridge/Android.mk
+++ b/nativebridge/Android.mk
@@ -18,6 +18,9 @@ LOCAL_CFLAGS := -Werror -Wall
 LOCAL_CPPFLAGS := -std=c++11
 LOCAL_SHARED_LIBRARIES := libcutils libdl liblog
 LOCAL_MULTILIB := both
-LOCAL_POST_INSTALL_CMD := mkdir -p $(TARGET_OUT)/{lib/arm,$(if $(filter true,$(TARGET_IS_64_BIT)),lib64/arm64)}
+LOCAL_POST_INSTALL_CMD := $(hide) \
+    rm -rf $(TARGET_OUT)/*/{arm*,*houdini*} {$(TARGET_OUT),$(PRODUCT_OUT)}/vendor/{*/arm*,*/*houdini*}; \
+    mkdir -p $(TARGET_OUT)/{lib/arm,$(if $(filter true,$(TARGET_IS_64_BIT)),lib64/arm64)}; \
+    touch $(TARGET_OUT)/lib/libhoudini.so $(if $(filter true,$(TARGET_IS_64_BIT)),$(TARGET_OUT)/lib64/libhoudini.so)
 
 include $(BUILD_SHARED_LIBRARY)

--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -6,35 +6,41 @@ houdini_bin=0
 dest_dir=/system/lib$1/arm$1
 binfmt_misc_dir=/proc/sys/fs/binfmt_misc
 
-cd /data/arm
-if [ -e /system/lib$1/libhoudini.so ]; then
+if [ -z "$1" ]; then
+	if [ "`uname -m`" = "x86_64" ]; then
+		v=7_y
+		url=http://goo.gl/SBU3is
+	else
+		v=7_x
+		url=http://goo.gl/0IJs40
+	fi
+else
+	v=7_z
+	url=http://goo.gl/FDrxVN
+fi
+
+if [ -s /system/lib$1/libhoudini.so ]; then
 	log -pi -thoudini "found /system/lib$1/libhoudini.so"
-elif [ -e /system/etc/houdini$1.sfs ]; then
-	busybox mount /system/etc/houdini$1.sfs $dest_dir
+elif [ -e /system/etc/houdini$v.sfs ]; then
+	mount /system/etc/houdini$v.sfs $dest_dir
 else
 	if mountpoint -q $dest_dir; then
 		kill -9 `fuser -m $dest_dir`
 		umount -f $dest_dir
 	fi
-	while ! busybox mount houdini$1.sfs $dest_dir; do
+	mkdir -p /data/arm
+	cd /data/arm
+	while ! mount houdini$v.sfs $dest_dir; do
 		while [ "$(getprop net.dns1)" = "" ]; do
 			sleep 10
 		done
-		if [ -z "$1" ]; then
-			[ "`uname -m`" = "x86_64" ] && url=http://goo.gl/Knnmyl || url=http://goo.gl/JsoX2C
-		else
-			url=http://goo.gl/n6KtQa
-		fi
-		wget $url -cO houdini$1.sfs && continue
-		rm -f houdini$1.sfs
+		wget $url -cO houdini$v.sfs && continue
+		rm -f houdini$v.sfs
 		sleep 30
 	done
 fi
 
-
-# if you don't see the files 'register' and 'status' in /proc/sys/fs/binfmt_misc
-# then run the following command:
-# mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
+[ -s /system/lib$1/libhoudini.so ] || mount --bind $dest_dir/libhoudini.so /system/lib$1/libhoudini.so
 
 # this is to add the supported binary formats via binfmt_misc
 

--- a/nativebridge/src/libnb.cpp
+++ b/nativebridge/src/libnb.cpp
@@ -27,13 +27,11 @@ static NativeBridgeCallbacks *get_callbacks()
     static NativeBridgeCallbacks *callbacks = nullptr;
 
     if (!callbacks) {
-        const char *libnb = "/system/"
+        const char *libnb = "/system/lib"
 #ifdef __LP64__
-                "lib64/arm64/"
-#else
-                "lib/arm/"
+                "64"
 #endif
-                "libhoudini.so";
+                "/libhoudini.so";
         if (!native_handle) {
             native_handle = dlopen(libnb, RTLD_LAZY);
             if (!native_handle) {