Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

[android-x86/device-generic-common.git] / nativebridge / bin / enable_nativebridge

diff --git a/nativebridge/bin/enable_nativebridge b/nativebridge/bin/enable_nativebridge
index 1b893ee..b05563a 100644 (file)
--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -6,37 +6,46 @@ houdini_bin=0
 dest_dir=/system/lib$1/arm$1
 binfmt_misc_dir=/proc/sys/fs/binfmt_misc
 
+urls[0]=http://t.cn/RBJ7mfG
+urls[1]=http://t.cn/RBJ7eml
+urls[2]=http://t.cn/RBJzLwu
+urls[3]=http://goo.gl/96BPKe
+urls[4]=http://goo.gl/v6c4Co
+urls[5]=http://goo.gl/CtKjxx
+
+mount_sfs()
+{
+       mount -o 'ro,context="u:object_r:system_file:s0"' $1 $2
+}
+
 if [ -z "$1" ]; then
-       if [ "`uname -m`" = "x86_64" ]; then
-               v=7_y
-               url=http://mrw.so/4HMwO9
-       else
-               v=7_x
-               url=http://mrw.so/4Pige8
-       fi
+       v=8_y
+       u=1
 else
-       v=7_z
-       url=http://mrw.so/5jn810
+       v=8_z
+       u=2
 fi
 
 if [ -s /system/lib$1/libhoudini.so ]; then
        log -pi -thoudini "found /system/lib$1/libhoudini.so"
 elif [ -e /system/etc/houdini$v.sfs ]; then
-       mount -o ro /system/etc/houdini$v.sfs $dest_dir
+       mount_sfs /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
-       mkdir -p /data/arm
-       cd /data/arm
-       while ! mount -o ro houdini$v.sfs $dest_dir; do
+       if [ ! -d /data/media/0/arm ]; then
+               mkdir -p /data/media/0/arm
+               chown 1023.1023 /data/media/0/arm
+       fi
+       cd /data/media/0/arm
+       [ -s /data/arm/houdini$v.sfs ] && mv /data/arm/houdini$v.sfs .
+       while ! mount_sfs houdini$v.sfs $dest_dir; do
                while [ "$(getprop net.dns1)" = "" ]; do
                        sleep 10
                done
-               wget $url -cO houdini$v.sfs && continue
-               rm -f houdini$v.sfs
-               sleep 30
+               [ -s houdini$v.sfs ] && sleep 10 || sleep 30
        done
 fi
 
@@ -45,6 +54,7 @@ fi
 # this is to add the supported binary formats via binfmt_misc
 
 if [ ! -e $binfmt_misc_dir/register ]; then
+       modprobe binfmt_misc
        mount -t binfmt_misc none $binfmt_misc_dir
 fi
 
@@ -72,6 +82,4 @@ else
        log -pi -thoudini "houdini$1 enabled"
 fi
 
-[ "$(getprop ro.zygote)" = "zygote64_32" -a -z "$1" ] && exec $0 64
-
 exit 0