Merge branch 'master' into remove

topjohnwu · Dec 10, 2024 · 2c9da2f · 2c9da2f
2 parents 8e63e37 + 2e86d21
commit 2c9da2f
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 121 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -88,6 +88,8 @@ jobs:
         include:
           - version: "Baklava"
             type: "google_apis"
+          - version: "Baklava"
+            type: "google_apis_ps16k"
 
     steps:
       - name: Check out
@@ -173,8 +175,6 @@ jobs:
         include:
           - branch: "aosp-main"
             device: "aosp_cf_x86_64_phone"
-          - branch: "aosp-main-throttled"
-            device: "aosp_cf_x86_64_phone_pgagnostic"
 
     steps:
       - name: Check out

diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt
@@ -75,7 +75,7 @@ fun Project.setupCommon() {
         compileSdkVersion(35)
         buildToolsVersion = "34.0.0"
         ndkPath = "$sdkDirectory/ndk/magisk"
-        ndkVersion = "27.0.12077973"
+        ndkVersion = "28.0.12674087"
 
         defaultConfig {
             minSdk = 23

diff --git a/gradle.properties b/gradle.properties
@@ -31,4 +31,4 @@ android.nonFinalResIds=false
 # Magisk
 magisk.stubVersion=40
 magisk.versionCode=28101
-magisk.ondkVersion=r27.4
+magisk.ondkVersion=r28.1