made requested houdini fixes

2 files changed, 35 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5ce330664c0..0037409b6edc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = anbox-image-gapps
 	pkgdesc = Android image for running in Anbox, with OpenGApps and houdini
 	pkgver = 2018.07.19
-	pkgrel = 11
+	pkgrel = 12
 	url = https://anbox.io
 	arch = x86_64
 	license = custom
@@ -11,19 +11,17 @@ pkgbase = anbox-image-gapps
 	makedepends = unzip
 	provides = anbox-image
 	conflicts = anbox-image
-	noextract = open_gapps-x86_64-7.1-mini-20190925.zip
+	noextract = open_gapps-x86_64-7.1-mini-20191022.zip
 	source = https://build.anbox.io/android-images/2018/07/19/android_amd64.img
-	source = https://downloads.sourceforge.net/project/opengapps/x86_64/20190925/open_gapps-x86_64-7.1-mini-20190925.zip
-	source = https://downloads.sourceforge.net/project/opengapps/x86_64/20190925/open_gapps-x86_64-7.1-mini-20190925.zip.md5
+	source = https://downloads.sourceforge.net/project/opengapps/x86_64/20191022/open_gapps-x86_64-7.1-mini-20191022.zip
+	source = https://downloads.sourceforge.net/project/opengapps/x86_64/20191022/open_gapps-x86_64-7.1-mini-20191022.zip.md5
 	source = houdini_y.sfs::http://dl.android-x86.org/houdini/7_y/houdini.sfs
 	source = houdini_z.sfs::http://dl.android-x86.org/houdini/7_z/houdini.sfs
-	source = https://github.com/Rprop/libhoudini/raw/master/4.0.8.45720/system/lib/libhoudini.so
 	md5sums = 26874452a6521ec2e37400670d438e33
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = 7ebf618b1af94a02322d9f2d2610090b
 	md5sums = 5ca37e1629edb7d13b18751b72dc98ad
-	md5sums = 205ef556ceb5f3dbcb9c309773a47fc9
 
 pkgname = anbox-image-gapps
 
diff --git a/PKGBUILD b/PKGBUILD
index 611a26ce220a..bf5fd64c565c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Robosky <fangyuhao0612 at gmail dot com>
 pkgname=anbox-image-gapps
 pkgver=2018.07.19
-pkgrel=11
+pkgrel=12
 pkgdesc="Android image for running in Anbox, with OpenGApps and houdini"
 arch=('x86_64')
 url="https://anbox.io"
@@ -25,16 +25,12 @@ source+=("${_OPENGAPPS_URL}.md5")
 source+=("houdini_y.sfs::http://dl.android-x86.org/houdini/7_y/houdini.sfs"
          "houdini_z.sfs::http://dl.android-x86.org/houdini/7_z/houdini.sfs")
 
-# libhoudini
-source+=("https://github.com/Rprop/libhoudini/raw/master/4.0.8.45720/system/lib/libhoudini.so")
-
 noextract=("${_OPENGAPPS_FILE}")
 md5sums=('26874452a6521ec2e37400670d438e33'
          'SKIP'
          'SKIP'
          '7ebf618b1af94a02322d9f2d2610090b'
-         '5ca37e1629edb7d13b18751b72dc98ad'
-         '205ef556ceb5f3dbcb9c309773a47fc9')
+         '5ca37e1629edb7d13b18751b72dc98ad')
          
 prepare() {
 	# verify OpenGApps against provided md5 file
@@ -70,36 +66,30 @@ build () {
 	cp -r ./$(find opengapps -type d -name "GoogleServicesFramework") ./squashfs-root/system/priv-app/
 
 	# load houdini_y
-	mkdir -p houdini_y
-	unsquashfs -f -d ./houdini_y ./houdini_y.sfs
+    mkdir -p houdini_y
+    rm -rf ./houdini_y/*
+    unsquashfs -f -d ./houdini_y ./houdini_y.sfs
 
-	cp -r ./houdini_y/houdini ./squashfs-root/system/bin/
-	cp -r ./houdini_y/xstdata ./squashfs-root/system/bin/
-	cp ./libhoudini.so ./squashfs-root/system/lib/
-	
-	mkdir -p ./squashfs-root/system/lib/arm
-	cp -r ./houdini_y/linker ./squashfs-root/system/lib/arm/
-	cp -r ./houdini_y/*.so ./squashfs-root/system/lib/arm/
-	cp -r ./houdini_y/nb ./squashfs-root/system/lib/arm/
-	
-	# load houdini_z
-	mkdir -p houdini_z
-	unsquashfs -f -d ./houdini_z ./houdini_z.sfs
+    mkdir -p ./squashfs-root/system/lib/arm
+    cp -r ./houdini_y/* ./squashfs-root/system/lib/arm
+    mv ./squashfs-root/system/lib/arm/libhoudini.so ./squashfs-root/system/lib/libhoudini.so
+
+    # load houdini_z
+    mkdir -p houdini_z
+    rm -rf ./houdini_z/*
+    unsquashfs -f -d ./houdini_z ./houdini_z.sfs
+
+    mkdir -p ./squashfs-root/system/lib64/arm64
+    cp -r ./houdini_z/* ./squashfs-root/system/lib64/arm64
+    mv ./squashfs-root/system/lib64/arm64/libhoudini.so ./squashfs-root/system/lib64/libhoudini.so
+
+    # add houdini parser
+    mkdir -p ./squashfs-root/system/etc/binfmt_misc
+    echo ':arm_exe:M::\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28::/system/lib/arm/houdini:P' >> ./squashfs-root/system/etc/binfmt_misc/arm_exe
+    echo ':arm_dyn:M::\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x28::/system/lib/arm/houdini:P' >> ./squashfs-root/system/etc/binfmt_misc/arm_dyn
+    echo ':arm64_exe:M::\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7::/system/lib64/arm64/houdini64:P' >> ./squashfs-root/system/etc/binfmt_misc/arm64_exe
+    echo ':arm64_dyn:M::\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\xb7::/system/lib64/arm64/houdini64:P' >> ./squashfs-root/system/etc/binfmt_misc/arm64_dyn
 
-	cp -r ./houdini_z/houdini64 ./squashfs-root/system/bin/
-	cp ./libhoudini.so ./squashfs-root/system/lib64/
-	
-	mkdir -p ./squashfs-root/system/lib/arm64
-	cp -r ./houdini_z/linker64 ./squashfs-root/system/lib/arm64/
-	cp -r ./houdini_z/*.so ./squashfs-root/system/lib/arm64/
-	cp -r ./houdini_z/nb ./squashfs-root/system/lib/arm64/
-
-	# add houdini parser
-	mkdir -p ./squashfs-root/system/etc/binfmt_misc
-	echo ':arm_exe:M::\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28::/system/bin/houdini:' >> ./squashfs-root/system/etc/binfmt_misc/arm_exe
-	echo ':arm_dyn:M::\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x28::/system/bin/houdini:' >> ./squashfs-root/system/etc/binfmt_misc/arm_dynp 
-	echo ':arm64_exe:M::\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7::/system/bin/houdini64:' >> ./squashfs-root/system/etc/binfmt_misc/arm64_exe
-	echo ':arm64_dyn:M::\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\xb7::/system/bin/houdini64:' >> ./squashfs-root/system/etc/binfmt_misc/arm64_dynp
 
 	# add features
 	_C=$(cat <<-END
@@ -126,12 +116,13 @@ build () {
 	sed -i "/<unavailable-feature name=\"android.hardware.wifi\" \/>/d" ./squashfs-root/system/etc/permissions/anbox.xml
 	sed -i "/<unavailable-feature name=\"android.hardware.bluetooth\" \/>/d" ./squashfs-root/system/etc/permissions/anbox.xml
 
-	# set processors
-	sed -i "/^ro.product.cpu.abilist=x86_64,x86/ s/$/,armeabi-v7a,armeabi,arm64-v8a/" ./squashfs-root/system/build.prop
-	sed -i "/^ro.product.cpu.abilist32=x86/ s/$/,armeabi-v7a,armeabi/" ./squashfs-root/system/build.prop
-	sed -i "/^ro.product.cpu.abilist64=x86_64/ s/$/,arm64-v8a/" ./squashfs-root/system/build.prop
+	sed -i '/^ro.product.cpu.abilist=x86_64,x86/ s/$/,arm64-v8a,armeabi-v7a,armeabi/' ./squashfs-root/system/build.prop
+    sed -i '/^ro.product.cpu.abilist32=x86/ s/$/,armeabi-v7a,armeabi/' ./squashfs-root/system/build.prop
+    sed -i '/^ro.product.cpu.abilist64=x86_64/ s/$/,arm64-v8a/' ./squashfs-root/system/build.prop
 
+	# enable nativebridge
 	echo "persist.sys.nativebridge=1" >> ./squashfs-root/system/build.prop
+	sed -i 's/ro.dalvik.vm.native.bridge=0/ro.dalvik.vm.native.bridge=libhoudini.so/' ./squashfs-root/default.prop
 
 	# enable opengles
 	echo "ro.opengles.version=131072" >> ./squashfs-root/system/build.prop
@@ -142,9 +133,8 @@ package() {
 	
 	# set owner
 	chown -R 100000:100000 ./squashfs-root/system/priv-app/{Phonesky,GoogleLoginService,GoogleServicesFramework,PrebuiltGmsCore}
-	chown -R 100000:100000 ./squashfs-root/system/bin/{xstdata,houdini,houdini64}
-	chown -R 100000:100000 ./squashfs-root/system/lib/{libhoudini.so,arm,arm64}
-	chown -R 100000:100000 ./squashfs-root/system/lib64/libhoudini.so
+	chown -R 100000:100000 ./squashfs-root/system/lib/{libhoudini.so,arm}
+	chown -R 100000:100000 ./squashfs-root/system/lib64/{libhoudini.so,arm64}
 	chown -R 100000:100000 ./squashfs-root/system/etc/binfmt_misc
 
 	# squash image