Commit: c6f116790c168254f445c185e47101bef28c229f - device-generic-common (git)

device/generic/common

Commit MetaInfo

• Revision: c6f116790c168254f445c185e47101bef28c229f (tree)
• Zeit: 2020-10-23 07:47:47
• Autor: Jon West <electrikjesus@gmai...>
• Commiter: Jon West

Log Message

Revert "nativebridge: disable 32k32u and 64k64u support temporarily"

This reverts commit a70ce18472041d9b9bba99e054307d90134adb96.

Ändern Zusammenfassung

• modified: nativebridge/bin/enable_nativebridge
• modified: nativebridge/nativebridge.mk

Diff

--- a/nativebridge/bin/enable_nativebridge
+++ b/nativebridge/bin/enable_nativebridge
@@ -19,11 +19,16 @@ mount_sfs()
 }
 
 if [ -z "$1" ]; then
-	v=9_y
-	u=1
+	if [ "`uname -m`" = "x86_64" ]; then
+		v=9_y
+		u=4
+	else
+		v=9_x
+		u=3
+	fi
 else
 	v=9_z
-	u=2
+	u=5
 fi
 
 if [ -s /system/lib$1/libhoudini.so ]; then
@@ -82,4 +87,6 @@ else
 	log -pi -thoudini "houdini$1 enabled"
 fi
 
+[ "$(getprop ro.zygote)" = "zygote64_32" -a -z "$1" ] && exec $0 64
+
 exit 0

--- a/nativebridge/nativebridge.mk
+++ b/nativebridge/nativebridge.mk
@@ -13,6 +13,7 @@ WITH_NATIVE_BRIDGE := true
 
 # Native Bridge ABI List
 NATIVE_BRIDGE_ABI_LIST_32_BIT := armeabi-v7a armeabi
+NATIVE_BRIDGE_ABI_LIST_64_BIT := arm64-v8a
 
 LOCAL_SRC_FILES := bin/enable_nativebridge