Merge branch 'main' into main

tiann · Oct 23, 2023 · 5cf96d0 · 5cf96d0
2 parents cb340fa + bf823a2
commit 5cf96d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/gki-kernel.yml b/.github/workflows/gki-kernel.yml
@@ -174,6 +174,7 @@ jobs:
           if [ -e build/build.sh ]; then
             CCACHE="/usr/bin/ccache" LTO=thin BUILD_CONFIG=common/build.config.gki.aarch64 build/build.sh
           else 
+            sed -i '/^rfkill_/d' common/android/abi_gki_protected_exports_*
             tools/bazel run --disk_cache=/home/runner/.cache/bazel --config=fast --config=stamp --lto=thin //common:kernel_aarch64_dist -- --dist_dir=dist
           fi
       

diff --git a/kernel/manager.c b/kernel/manager.c
@@ -27,7 +27,7 @@ bool become_manager(char *pkg)
 #ifdef KSU_MANAGER_PACKAGE
 	// pkg is `/<real package>`
 	if (strncmp(pkg + 1, KSU_MANAGER_PACKAGE,
-		    sizeof(KSU_MANAGER_PACKAGE) - 1) != 0) {
+		    sizeof(KSU_MANAGER_PACKAGE)) != 0) {
 		pr_info("manager package is inconsistent with kernel build: %s\n",
 			KSU_MANAGER_PACKAGE);
 		return false;