Test 16k CF

.github/workflows/build.yml

@@ -15,6 +15,8 @@ jobs:
         include:
           - version: 35
             type: "google_apis"
+          - version: 35
+            type: "google_apis_ps16k"
 
     steps:
       - name: Check out
@@ -45,6 +47,8 @@ jobs:
         include:
           - branch: "aosp-main"
             target: "aosp_cf_x86_64_phone-trunk_staging-userdebug"
+          - branch: "aosp-main-throttled"
+            target: "aosp_cf_x86_64_phone_pgagnostic-trunk_staging-userdebug"
 
     steps:
       - name: Check out

scripts/avd_patch.sh

@@ -71,13 +71,14 @@ export KEEPFORCEENCRYPT=true
 echo "KEEPVERITY=$KEEPVERITY" > config
 echo "KEEPFORCEENCRYPT=$KEEPFORCEENCRYPT" >> config
 echo "PREINITDEVICE=$(./magisk --preinit-device)" >> config
-# For API 28, we also patch advancedFeatures.ini to disable SAR
-# Manually override skip_initramfs by setting RECOVERYMODE=true
+# For API 28, we also manually disable SystemAsRoot
+# Explicitly override skip_initramfs by setting RECOVERYMODE=true
 [ $API = "28" ] && echo 'RECOVERYMODE=true' >> config
 cat config
 
 ./magiskboot compress=xz magisk magisk.xz
 ./magiskboot compress=xz stub.apk stub.xz
+./magiskboot compress=xz init-ld init-ld.xz
 
 ./magiskboot cpio ramdisk.cpio \
 "add 0750 init magiskinit" \
@@ -85,12 +86,13 @@ cat config
 "mkdir 0750 overlay.d/sbin" \
 "add 0644 overlay.d/sbin/magisk.xz magisk.xz" \
 "add 0644 overlay.d/sbin/stub.xz stub.xz" \
+"add 0644 overlay.d/sbin/init-ld.xz init-ld.xz" \
 "patch" \
 "backup ramdisk.cpio.orig" \
 "mkdir 000 .backup" \
 "add 000 .backup/.magisk config"
 
-rm -f ramdisk.cpio.orig config magisk*.xz stub.xz
+rm -f ramdisk.cpio.orig config *.xz
 if $IS_RAMDISK; then
   ./magiskboot compress=gzip ramdisk.cpio "$OUTPUT_FILE"
 else

scripts/avd_test.sh

@@ -3,13 +3,14 @@
 set -xe
 . scripts/test_common.sh
 
-emu_args_base="-no-window -no-audio -no-boot-anim -gpu swiftshader_indirect -read-only -no-snapshot -cores $(nproc)"
+emu_args_base="-no-window -no-audio -no-boot-anim -gpu swiftshader_indirect -read-only -no-snapshot -cores $core_count"
 lsposed_url='https://github.com/LSPosed/LSPosed/releases/download/v1.9.2/LSPosed-v1.9.2-7024-zygisk-release.zip'
 emu_pid=
 
 atd_min_api=30
 atd_max_api=34
 lsposed_min_api=27
+lsposed_max_api=34
 huge_ram_min_api=26
 
 cleanup() {
@@ -67,29 +68,24 @@ test_emu() {
 
   print_title "* Testing $pkg ($variant)"
 
-  if [ -n "$AVD_TEST_VERBOSE" ]; then
-    "$emu" @test $emu_args &
-    emu_pid=$!
-    adb logcat &
+  if [ -n "$AVD_TEST_LOG" ]; then
+    "$emu" @test $emu_args > kernel.log 2>&1 &
   else
-    "$emu" @test $emu_args 2>/dev/null &
-    emu_pid=$!
+    "$emu" @test $emu_args > /dev/null 2>&1 &
   fi
 
+  emu_pid=$!
   wait_emu wait_for_boot
 
   test_setup $variant
 
   # Install LSPosed
-  if [ $api -ge $lsposed_min_api -a $api -le $atd_max_api ]; then
+  if [ $api -ge $lsposed_min_api -a $api -le $lsposed_max_api ]; then
     adb push out/lsposed.zip /data/local/tmp/lsposed.zip
     echo 'PATH=$PATH:/debug_ramdisk magisk --install-module /data/local/tmp/lsposed.zip' | adb shell /system/xbin/su
   fi
 
   adb reboot
-  if [ -n "$AVD_TEST_VERBOSE" ]; then
-    adb logcat &
-  fi
   wait_emu wait_for_boot
 
   test_app
@@ -147,9 +143,6 @@ run_test() {
   fi
 
   emu_args="$emu_args_base -memory $memory"
-  if [ -n "$AVD_TEST_VERBOSE" ]; then
-    emu_args="$emu_args -show-kernel"
-  fi
 
   # Setup emulator
   "$sdk" --channel=3 $pkg
@@ -157,12 +150,15 @@ run_test() {
 
   # Launch stock emulator
   print_title "* Launching $pkg"
-  "$emu" @test $emu_args 2>/dev/null &
+  "$emu" @test $emu_args >/dev/null 2>&1 &
   emu_pid=$!
   wait_emu wait_for_bootanim
 
   # Update arguments for Magisk runs
   emu_args="$emu_args -ramdisk magisk_patched.img -feature -SystemAsRoot"
+  if [ -n "$AVD_TEST_LOG" ]; then
+    emu_args="$emu_args -show-kernel -logcat '' -logcat-output logcat.log"
+  fi
 
   # Patch and test debug build
   ./build.py avd_patch -s "$ramdisk" magisk_patched.img
@@ -221,7 +217,7 @@ else
   # Android 15 Beta
   run_test 35 google_apis
   # Run 16k page tests
-  run_test VanillaIceCream google_apis_ps16k
+  run_test 35 google_apis_ps16k
 fi
 
 "$avd" delete avd -n test

scripts/cuttlefish.sh

@@ -3,7 +3,7 @@
 set -xe
 . scripts/test_common.sh
 
-cvd_args="-daemon -enable_sandbox=false -memory_mb=8192 -report_anonymous_usage_stats=n -cpus=$(nproc)"
+cvd_args="-daemon -enable_sandbox=false -memory_mb=8192 -report_anonymous_usage_stats=n -cpus=$core_count"
 magisk_args='-init_boot_image=magisk_patched.img'
 
 cleanup() {

scripts/test_common.sh

@@ -4,12 +4,17 @@ fi
 
 export PATH="$PATH:$ANDROID_HOME/platform-tools"
 
-sdk="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
 emu="$ANDROID_HOME/emulator/emulator"
+sdk="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
 avd="$ANDROID_HOME/cmdline-tools/latest/bin/avdmanager"
 
 boot_timeout=600
 
+core_count=$(nproc)
+if [ $core_count -gt 8 ]; then
+  core_count=8
+fi
+
 print_title() {
   echo -e "\n\033[44;39m${1}\033[0m\n"
 }