android/vendor_gapps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix arch checks

Browse Source 
Some devices have a 32-bit userspace but a 64-bit kernel. These
devices need to have 32-bit gapps, not 64-bit ones. To fix this,
switch to getting arch from ro.bionic.arch instead of uname -m.
Additionally, remove the nice_arch function as it makes debugging
issues more difficult when the nice arch matches but the underlying
values don't line up.
This commit is contained in:
Paul Keith 2022-08-30 13:08:39 -04:00 committed by LuK1337
parent 83a87f751d
commit 251da7189e
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/main.mk
View File

@ -11,11 +11,11 @@ distclean:
gapps_arm: gapps_arm:
@echo "Compiling GApps for arm..." @echo "Compiling GApps for arm..."
@bash $(BUILD_GAPPS) arm armv7l 2>&1 @bash $(BUILD_GAPPS) arm 2>&1
gapps_arm64: gapps_arm64:
@echo "Compiling GApps for arm64..." @echo "Compiling GApps for arm64..."
@bash $(BUILD_GAPPS) arm64 aarch64 2>&1 @bash $(BUILD_GAPPS) arm64 2>&1
gapps_x86: gapps_x86:
@echo "Compiling GApps for x86..." @echo "Compiling GApps for x86..."

18
build/meta/com/google/android/update-binary
View File

@ -25,20 +25,6 @@ getprop2() {
grep -m 1 "^$2=" $1 | cut -d= -f2 grep -m 1 "^$2=" $1 | cut -d= -f2
} }
nice_arch() {
case $1 in
aarch64*|armv8*)
echo "arm64"
;;
arm*)
echo "arm"
;;
*)
echo $1
;;
esac
}
cleanup() { cleanup() {
ui_print "Cleaning up files" ui_print "Cleaning up files"
rm -rf $TMP/system rm -rf $TMP/system
@ -142,9 +128,9 @@ rm -rf META-INF
# compiled for a different architecture. Just hope that all environments have at least # compiled for a different architecture. Just hope that all environments have at least
# a proper `grep` and `uname`. # a proper `grep` and `uname`.
GAPPS_ARCH=$(getprop2 $TMP/build.prop arch) GAPPS_ARCH=$(getprop2 $TMP/build.prop arch)
CPU_ARCH=$(uname -m) CPU_ARCH=$(getprop ro.bionic.arch)
if [ $GAPPS_ARCH != $CPU_ARCH ]; then if [ $GAPPS_ARCH != $CPU_ARCH ]; then
error "This package is built for $(nice_arch $GAPPS_ARCH) but your device is $(nice_arch $CPU_ARCH)! Aborting" error "This package is built for $GAPPS_ARCH but your device is $CPU_ARCH! Aborting"
fi fi
ui_print "Setting up environment" ui_print "Setting up environment"