feat: bump to android-15.0

ponces · Oct 14, 2024 · 73f12ad · 73f12ad
1 parent 78db152
commit 73f12ad
Show file tree

Hide file tree

Showing 28 changed files with 661 additions and 4,293 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
         type: string
   push:
     branches:
-      - android-14.0
+      - android-15.0
     paths-ignore:
       - '.github/**'
       - 'config/**'

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ To get started with building AOSP GSI, you'll need to get familiar with [Git and
     ```
 - Clone this repo:
     ```
-    git clone https://github.com/ponces/treble_aosp -b android-14.0
+    git clone https://github.com/ponces/treble_aosp -b android-15.0
     ```
 - Finally, start the build script:
     ```

diff --git a/build.sh b/build.sh
@@ -2,7 +2,7 @@
 
 echo
 echo "--------------------------------------"
-echo "          AOSP 14.0 Buildbot          "
+echo "          AOSP 15.0 Buildbot          "
 echo "                  by                  "
 echo "                ponces                "
 echo "--------------------------------------"
@@ -16,7 +16,7 @@ BV=$1
 
 initRepos() {
     echo "--> Initializing workspace"
-    repo init -u https://android.googlesource.com/platform/manifest -b android-14.0.0_r55 --git-lfs
+    repo init -u https://android.googlesource.com/platform/manifest -b android-15.0.0_r1 --git-lfs
     echo
 
     echo "--> Preparing local manifest"
@@ -67,7 +67,7 @@ buildTrebleApp() {
 
 buildVariant() {
     echo "--> Building $1"
-    lunch "$1"-ap2a-userdebug
+    lunch "$1"-ap3a-userdebug
     make -j$(nproc --all) installclean
     make -j$(nproc --all) systemimage
     make -j$(nproc --all) target-files-package otatools
@@ -79,22 +79,17 @@ buildVariant() {
 
 buildVndkliteVariant() {
     echo "--> Building $1-vndklite"
-    [[ "$1" == *"a64"* ]] && arch="32" || arch="64"
     cd treble_adapter
-    sudo bash lite-adapter.sh "$arch" $BD/system-"$1".img
+    sudo bash lite-adapter.sh "64" $BD/system-"$1".img
     mv s.img $BD/system-"$1"-vndklite.img
     sudo rm -rf d tmp
     cd ..
     echo
 }
 
 buildVariants() {
-    buildVariant treble_a64_bvN
-    buildVariant treble_a64_bgN
     buildVariant treble_arm64_bvN
     buildVariant treble_arm64_bgN
-    buildVndkliteVariant treble_a64_bvN
-    buildVndkliteVariant treble_a64_bgN
     buildVndkliteVariant treble_arm64_bvN
     buildVndkliteVariant treble_arm64_bgN
 }
@@ -104,10 +99,9 @@ generatePackages() {
     buildDate="$(date +%Y%m%d)"
     find $BD/ -name "system-treble_*.img" | while read file; do
         filename="$(basename $file)"
-        [[ "$filename" == *"_a64"* ]] && arch="arm32_binder64" || arch="arm64"
         [[ "$filename" == *"_bvN"* ]] && variant="vanilla" || variant="gapps"
         [[ "$filename" == *"-vndklite"* ]] && vndk="-vndklite" || vndk=""
-        name="aosp-${arch}-ab-${variant}${vndk}-14.0-$buildDate"
+        name="aosp-arm64-ab-${variant}${vndk}-15.0-$buildDate"
         xz -cv "$file" -T0 > $BD/"$name".img.xz
     done
     rm -rf $BD/system-*.img
@@ -120,13 +114,12 @@ generateOta() {
     buildDate="$(date +%Y%m%d)"
     timestamp="$START"
     json="{\"version\": \"$version\",\"date\": \"$timestamp\",\"variants\": ["
-    find $BD/ -name "aosp-*-14.0-$buildDate.img.xz" | sort | {
+    find $BD/ -name "aosp-*-15.0-$buildDate.img.xz" | sort | {
         while read file; do
             filename="$(basename $file)"
-            [[ "$filename" == *"-arm32"* ]] && arch="a64" || arch="arm64"
             [[ "$filename" == *"-vanilla"* ]] && variant="v" || variant="g"
             [[ "$filename" == *"-vndklite"* ]] && vndk="-vndklite" || vndk=""
-            name="treble_${arch}_b${variant}N${vndk}"
+            name="treble_arm64_b${variant}N${vndk}"
             size=$(wc -c $file | awk '{print $1}')
             url="https://github.com/ponces/treble_aosp/releases/download/$version/$filename"
             json="${json} {\"name\": \"$name\",\"size\": \"$size\",\"url\": \"$url\"},"

diff --git a/build/aosp.mk b/build/aosp.mk
@@ -1,4 +1,4 @@
 $(call inherit-product, vendor/ponces/config/common.mk)
 
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.system.ota.json_url=https://raw.githubusercontent.com/ponces/treble_aosp/android-14.0/config/ota.json
+    ro.system.ota.json_url=https://raw.githubusercontent.com/ponces/treble_aosp/android-15.0/config/ota.json
diff --git a/build/default.xml b/build/default.xml
@@ -4,20 +4,20 @@
   <remote name="gitlab" fetch="https://gitlab.com" />
 
   <!-- TrebleDroid -->
-  <project name="TrebleDroid/device_phh_treble" path="device/phh/treble" remote="github" revision="android-14.0" />
+  <project name="TrebleDroid/device_phh_treble" path="device/phh/treble" remote="github" revision="android-15.0" />
   <project name="TrebleDroid/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
-  <project name="TrebleDroid/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-14.0" />
+  <project name="TrebleDroid/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-15.0" />
   <project name="TrebleDroid/treble_app" path="treble_app" remote="github" revision="master" />
   <project name="phhusson/vendor_magisk" path="vendor/magisk" remote="github" revision="android-10.0" />
   <project name="AndyCGYan/android_packages_apps_QcRilAm" path="packages/apps/QcRilAm" remote="github" revision="master" />
   <project name="platform/prebuilts/vndk/v28" path="prebuilts/vndk/v28" remote="aosp" revision="204f1bad00aaf480ba33233f7b8c2ddaa03155dd" clone-depth="1" />
 
   <!-- ponces -->
-  <project name="ponces/vendor_ponces" path="vendor/ponces" remote="github" revision="android-14.0" />
-  <project name="ponces/vendor_gapps" path="vendor/gapps" remote="gitlab" revision="android-14.0" clone-depth="1" />
+  <project name="ponces/vendor_ponces" path="vendor/ponces" remote="github" revision="android-15.0" />
+  <project name="ponces/vendor_gapps" path="vendor/gapps" remote="gitlab" revision="android-15.0" clone-depth="1" />
   <project name="ponces/treble_adapter" path="treble_adapter" remote="github" revision="master" />
   <project name="ponces/packages_apps_ParanoidSense" path="packages/apps/ParanoidSense" remote="github" revision="uvite" />
-  <project name="ponces/packages_services_OmniJaws" path="packages/services/OmniJaws" remote="github" revision="14.0" />
+  <project name="ponces/packages_services_OmniJaws" path="packages/services/OmniJaws" remote="github" revision="15.0" />
 
   <!-- LineageOS -->
   <remove-project name="platform/packages/apps/Launcher3" />

diff --git a/build/remove.xml b/build/remove.xml
@@ -1,54 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <remove-project name="device/google/atv" />
   <remove-project name="device/google/akita" />
-  <remove-project name="device/google/akita-kernel" />
+  <remove-project name="device/google/akita-kernels/5.15" />
   <remove-project name="device/google/akita-sepolicy" />
+  <remove-project name="device/google/atv" />
   <remove-project name="device/google/barbet" />
   <remove-project name="device/google/barbet-sepolicy" />
   <remove-project name="device/google/bluejay" />
-  <remove-project name="device/google/bluejay-kernel" />
+  <remove-project name="device/google/bluejay-kernels/5.10" />
   <remove-project name="device/google/bluejay-sepolicy" />
-  <remove-project name="device/google/bramble" />
-  <remove-project name="device/google/bramble-sepolicy" />
-  <remove-project name="device/google/coral" />
+  <remove-project name="device/google/caimito" />
+  <remove-project name="device/google/caimito-kernels/6.1" />
+  <remove-project name="device/google/caimito-sepolicy" />
+  <remove-project name="device/google/comet" />
+  <remove-project name="device/google/comet-kernels/6.1" />
+  <remove-project name="device/google/comet-sepolicy" />
+  <remove-project name="device/google/common/etm" />
   <remove-project name="device/google/contexthub" />
+  <remove-project name="device/google/coral" />
   <remove-project name="device/google/coral-kernel" />
   <remove-project name="device/google/coral-sepolicy" />
   <remove-project name="device/google/felix" />
-  <remove-project name="device/google/felix-kernel" />
+  <remove-project name="device/google/felix-kernels/5.10" />
   <remove-project name="device/google/felix-sepolicy" />
   <remove-project name="device/google/gs101" />
   <remove-project name="device/google/gs101-sepolicy" />
   <remove-project name="device/google/gs201" />
   <remove-project name="device/google/gs201-sepolicy" />
   <remove-project name="device/google/gs-common" />
   <remove-project name="device/google/lynx" />
-  <remove-project name="device/google/lynx-kernel" />
+  <remove-project name="device/google/lynx-kernels/5.10" />
   <remove-project name="device/google/lynx-sepolicy" />
   <remove-project name="device/google/pantah" />
-  <remove-project name="device/google/pantah-kernel" />
+  <remove-project name="device/google/pantah-kernels/5.10" />
   <remove-project name="device/google/pantah-sepolicy" />
   <remove-project name="device/google/raviole" />
-  <remove-project name="device/google/raviole-kernel" />
+  <remove-project name="device/google/raviole-kernels/5.10" />
   <remove-project name="device/google/redbull" />
   <remove-project name="device/google/redbull-kernel" />
   <remove-project name="device/google/redbull-sepolicy" />
   <remove-project name="device/google/redfin" />
   <remove-project name="device/google/redfin-sepolicy" />
-  <remove-project name="device/google/trout" />
   <remove-project name="device/google/shusky" />
-  <remove-project name="device/google/shusky-kernel" />
+  <remove-project name="device/google/shusky-kernels/5.15" />
   <remove-project name="device/google/shusky-sepolicy" />
   <remove-project name="device/google/sunfish" />
   <remove-project name="device/google/sunfish-kernel" />
   <remove-project name="device/google/sunfish-sepolicy" />
   <remove-project name="device/google/tangorpro" />
-  <remove-project name="device/google/tangorpro-kernel" />
+  <remove-project name="device/google/tangorpro-kernels/5.10" />
   <remove-project name="device/google/tangorpro-sepolicy" />
+  <remove-project name="device/google/trout" />
   <remove-project name="device/google/vrservices" />
   <remove-project name="device/google/zuma" />
   <remove-project name="device/google/zuma-sepolicy" />
+  <remove-project name="device/google/zumapro" />
+  <remove-project name="device/google/zumapro-sepolicy" />
   <remove-project name="device/google_car" />
   <remove-project name="platform/prebuilts/android-emulator" />
 </manifest>
diff --git a/patches/personal/device_phh_treble/0001-Import-vendor-gapps.patch b/patches/personal/device_phh_treble/0001-Import-vendor-gapps.patch
@@ -1,23 +1,22 @@
-From 2bf85c385f0e9c41ab6c33cfab114457275db967 Mon Sep 17 00:00:00 2001
+From 990e22c107d7144f41c83b39a6e48f2f89248e10 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 21 Feb 2023 22:51:12 +0000
-Subject: [PATCH 1/3] Import vendor/gapps
+Subject: [PATCH 1/2] Import vendor/gapps
 
 ---
- generate.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ generate.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/generate.sh b/generate.sh
-index 461eff1..4c7690a 100644
+index 9c20eb5..8fbb16b 100644
 --- a/generate.sh
 +++ b/generate.sh
-@@ -26,7 +26,8 @@ for part in a ab;do
+@@ -26,7 +26,7 @@ for part in a ab;do
  		optional_base=""
  				if [ "$apps" == "gapps" ];then
  					apps_suffix="g"
 -					apps_script='$(call inherit-product, device/phh/treble/gapps.mk)'
-+					[[ "$arch" == "a64" ]] && base="arm" || base="arm64"
-+					apps_script="\$(call inherit-product, vendor/gapps/$base/$base-vendor.mk)"
++					apps_script='$(call inherit-product, vendor/gapps/common/common-vendor.mk)'
  					apps_name="with GApps"
  				fi
  				if [ "$apps" == "gapps-go" ];then

diff --git a/patches/personal/device_phh_treble/0002-Rework-securize-tweak.patch b/patches/personal/device_phh_treble/0002-Rework-securize-tweak.patch
@@ -1,7 +1,7 @@
 From 1423a40a59b5d849e6161a3e7cdf0de003dcbad9 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Wed, 25 Dec 2019 12:34:05 +0200
-Subject: [PATCH 2/3] Rework securize tweak
+Subject: [PATCH 2/2] Rework securize tweak
 
 ---
  base.mk      |  1 -

diff --git a/...ersonal/device_phh_treble/0003-a64-Set-BUILD_BROKEN_MISSING_REQUIRED_MODULES-to-tru.patch b/...ersonal/device_phh_treble/0003-a64-Set-BUILD_BROKEN_MISSING_REQUIRED_MODULES-to-tru.patch
diff --git a/patches/personal/platform_build/0001-Remove-su-from-vanilla-builds.patch b/patches/personal/platform_build/0001-Remove-su-from-vanilla-builds.patch
@@ -1,4 +1,4 @@
-From c046f10027f788fc6645a7d377f0c9e90ce399e6 Mon Sep 17 00:00:00 2001
+From c690eeb44a8d7fda7522b8681decb07ac861313f Mon Sep 17 00:00:00 2001
 From: Victor Bo <bvoid@yandex.ru>
 Date: Sat, 14 Dec 2019 23:46:34 +0200
 Subject: [PATCH 1/2] Remove su from vanilla builds
@@ -8,10 +8,10 @@ Subject: [PATCH 1/2] Remove su from vanilla builds
  1 file changed, 1 deletion(-)
 
 diff --git a/target/product/base_system.mk b/target/product/base_system.mk
-index c6ca3dda2c..58d9629a92 100644
+index 4f21c3ed63..c54b6f7ba4 100644
 --- a/target/product/base_system.mk
 +++ b/target/product/base_system.mk
-@@ -436,7 +436,6 @@ PRODUCT_PACKAGES_DEBUG := \
+@@ -471,7 +471,6 @@ PRODUCT_PACKAGES_DEBUG := \
      ss \
      start_with_lockagent \
      strace \

diff --git a/patches/personal/platform_build/0002-product-Exclude-AOSP-apn-list-on-custom-builds.patch b/patches/personal/platform_build/0002-product-Exclude-AOSP-apn-list-on-custom-builds.patch
@@ -1,4 +1,4 @@
-From 32bd5279405b2013c1152338ab79dca6585983b7 Mon Sep 17 00:00:00 2001
+From e38da8c1aa80ac5ec327cb6fa3aba867caa11871 Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Tue, 26 Dec 2023 17:01:46 +0000
 Subject: [PATCH 2/2] product: Exclude AOSP apn list on custom builds
@@ -10,13 +10,13 @@ Change-Id: I76c8d5ef67de73d4558d350a87a9bc317aaad792
  2 files changed, 6 deletions(-)
 
 diff --git a/target/product/aosp_product.mk b/target/product/aosp_product.mk
-index f72f2dfec4..05bcaefcea 100644
+index 3a5b622f99..26070b7f2b 100644
 --- a/target/product/aosp_product.mk
 +++ b/target/product/aosp_product.mk
-@@ -35,8 +35,3 @@ PRODUCT_PACKAGES += \
+@@ -34,8 +34,3 @@ PRODUCT_PACKAGES += \
+     PhotoTable \
      preinstalled-packages-platform-aosp-product.xml \
      ThemePicker \
-     WallpaperPicker \
 -
 -# Telephony:
 -#   Provide a APN configuration to GSI product

diff --git a/.../platform_frameworks_base/0001-gmscompat-Change-attestation-and-instrumentation-to-.patch b/.../platform_frameworks_base/0001-gmscompat-Change-attestation-and-instrumentation-to-.patch
@@ -1,8 +1,8 @@
-From 2804e0c5f6443f0ab18056c86ed4e50faa60af92 Mon Sep 17 00:00:00 2001
+From 6bb6ae865746aa6cf8258396daa95edbca434f8e Mon Sep 17 00:00:00 2001
 From: Alberto Ponces <ponces26@gmail.com>
 Date: Thu, 9 Nov 2023 12:33:55 +0100
-Subject: [PATCH 01/10] gmscompat: Change attestation and instrumentation to
- pass SafetyNet and Play Integrity API.
+Subject: [PATCH 1/8] gmscompat: Change attestation and instrumentation to pass
+ SafetyNet and Play Integrity API.
 
 Original work by @kdrag0n.
 Updated by many people like @dereference23, @Stallix, @dyneteve, @neobuddy89 and @jhenrique09.
@@ -16,7 +16,7 @@ Adapted by @ponces based on the work of @chiteroman to pass newest Play Integrit
  create mode 100644 core/java/com/android/internal/gmscompat/AttestationHooks.java
 
 diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
-index db216b1a..9445bc1b 100644
+index db216b1af..9445bc1b5 100644
 --- a/core/java/android/app/Instrumentation.java
 +++ b/core/java/android/app/Instrumentation.java
 @@ -63,6 +63,8 @@ import android.view.WindowManagerGlobal;
@@ -46,7 +46,7 @@ index db216b1a..9445bc1b 100644
 
 diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
 new file mode 100644
-index 00000000..cff1250c
+index 000000000..eb59bed82
 --- /dev/null
 +++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
 @@ -0,0 +1,100 @@
@@ -116,13 +116,13 @@ index 00000000..cff1250c
 +    }
 +
 +    private static void spoofBuildGms() {
-+        setBuildField("PRODUCT", "akita_beta");
-+        setBuildField("DEVICE", "akita");
++        setBuildField("PRODUCT", "oriole_beta");
++        setBuildField("DEVICE", "oriole");
 +        setBuildField("MANUFACTURER", "Google");
 +        setBuildField("BRAND", "google");
-+        setBuildField("MODEL", "Pixel 8a");
-+        setBuildField("FINGERPRINT", "google/akita_beta/akita:15/AP31.240617.015/12207491:user/release-keys");
-+        setVersionField("SECURITY_PATCH", "2024-08-05");
++        setBuildField("MODEL", "Pixel 6");
++        setBuildField("FINGERPRINT", "google/oriole_beta/oriole:15/AP41.240823.009/12329489:user/release-keys");
++        setVersionField("SECURITY_PATCH", "2024-09-05");
 +        setVersionField("DEVICE_INITIAL_SDK_INT", Build.VERSION_CODES.LOLLIPOP);
 +    }
 +
@@ -151,7 +151,7 @@ index 00000000..cff1250c
 +    }
 +}
 diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
-index e6a63b9c..6a80c14c 100644
+index e6a63b9c4..6a80c14c9 100644
 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
 +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
 @@ -48,6 +48,7 @@ import android.system.keystore2.ResponseCode;

diff --git a/...s/personal/platform_frameworks_base/0002-gmscompat-Spoof-Pixel-XL-for-Google-Photos.patch b/...s/personal/platform_frameworks_base/0002-gmscompat-Spoof-Pixel-XL-for-Google-Photos.patch
@@ -1,15 +1,15 @@
-From 482bc6f508e57d21199ee466af827b8e675606a4 Mon Sep 17 00:00:00 2001
+From 3ca70b42c7f24ce1138f2c3a78ef00bf720cb22a Mon Sep 17 00:00:00 2001
 From: vladsendrix <83285656+vladsendrix@users.noreply.github.com>
 Date: Fri, 31 Dec 2021 03:18:04 +0100
-Subject: [PATCH 02/10] gmscompat: Spoof Pixel XL for Google Photos
+Subject: [PATCH 2/8] gmscompat: Spoof Pixel XL for Google Photos
 
 Change-Id: I905e40625b07ebf500cbb3ce1deadedee2e624c5
 ---
  .../internal/gmscompat/AttestationHooks.java       | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
 diff --git a/core/java/com/android/internal/gmscompat/AttestationHooks.java b/core/java/com/android/internal/gmscompat/AttestationHooks.java
-index cff1250c..dfbf69a0 100644
+index eb59bed82..563bad8a8 100644
 --- a/core/java/com/android/internal/gmscompat/AttestationHooks.java
 +++ b/core/java/com/android/internal/gmscompat/AttestationHooks.java
 @@ -32,6 +32,7 @@ public final class AttestationHooks {