From d5ba462eb88f1308537d0594c5daaaa5b38833ab Mon Sep 17 00:00:00 2001
From: "Christopher A. Williamson" <home@chrisaw.com>
Date: Mon, 29 Jul 2024 09:06:31 +0100
Subject: [PATCH] Rename apps to app store and re-enable all build steps

---
 .github/workflows/build-gsi.yml | 274 ++++++++++++++++----------------
 configs/manifest.xml            |   4 +-
 configs/voltage-vanilla.mk      |   2 +-
 3 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/.github/workflows/build-gsi.yml b/.github/workflows/build-gsi.yml
index 4cf431c..4750b56 100644
--- a/.github/workflows/build-gsi.yml
+++ b/.github/workflows/build-gsi.yml
@@ -100,149 +100,149 @@ jobs:
         lunch treble_arm64_bvN-ap1a-userdebug
         make vndk-test-sepolicy -j"$(nproc --all)"
       working-directory: src
-#    - name: build standard microg arm64 image
-#      run: |
-#        # copy microg config
-#        pushd device/phh/treble
-#          cp -fv ../../../../configs/voltage-microg.mk voltage.mk
-#          bash generate.sh voltage
-#        popd
-#
-#        # copy microg to correct folder for build
-#        cp -Rfv ../tmp/partner_gms vendor/
-#
-#        . build/envsetup.sh
-#        lunch treble_arm64_bmN-ap1a-userdebug
-#        make systemimage -j"$(nproc --all)"
-#        mv -v out/target/product/tdgsi_arm64_ab/system.img ../tmp/system_microg_arm64.img
-#        # remove microg folder to avoid contaminating next build
-#        rm -Rfv vendor/partner_gms
-#      working-directory: src
-#    - name: build standard gapps arm64 image
-#      run: |
-#        # copy gapps config
-#        pushd device/phh/treble
-#          cp -fv ../../../../configs/voltage-gapps.mk voltage.mk
-#          bash generate.sh voltage
-#        popd
-#
-#        # copy gapps to correct folder for build
-#        cp -Rfv ../tmp/gapps vendor/
-#        . build/envsetup.sh
-#        lunch treble_arm64_bgN-ap1a-userdebug
-#        make systemimage -j"$(nproc --all)"
-#        mv -v out/target/product/tdgsi_arm64_ab/system.img ../tmp/system_gapps_arm64.img
-#        # remove gapps folder to avoid contaminating next build
-#        rm -Rfv vendor/gapps
-#      working-directory: src
-#    - name: build standard vanilla arm32_binder64 image
-#      run: |
-#        # copy vanilla config
-#        pushd device/phh/treble
-#          cp -fv ../../../../configs/voltage-vanilla.mk voltage.mk
-#          bash generate.sh voltage
-#        popd
-#
-#        . build/envsetup.sh
-#        lunch treble_a64_bvN-ap1a-userdebug
-#        make systemimage -j"$(nproc --all)"
-#        mv -v out/target/product/tdgsi_a64_ab/system.img ../tmp/system_vanilla_arm32_binder64.img
-#      working-directory: src
-#    - name: build standard microg arm32_binder64 image
-#      run: |
-#        # copy microg config
-#        pushd device/phh/treble
-#          cp -fv ../../../../configs/voltage-microg.mk voltage.mk
-#          bash generate.sh voltage
-#        popd
-#
-#        # copy microg to correct folder for build
-#        cp -Rfv ../tmp/partner_gms vendor/
-#        . build/envsetup.sh
-#        lunch treble_a64_bmN-ap1a-userdebug
-#        make systemimage -j"$(nproc --all)"
-#        mv -v out/target/product/tdgsi_a64_ab/system.img ../tmp/system_microg_arm32_binder64.img
-#         # remove microg folder to avoid contaminating next build
-#        rm -Rfv vendor/partner_gms
-#      working-directory: src
-#    - name: build standard gapps arm32_binder64 image
-#      run: |
-#        # copy gapps config
-#        pushd device/phh/treble
-#          cp -fv ../../../../configs/voltage-gapps.mk voltage.mk
-#          bash generate.sh voltage
-#        popd
-#
-#        # copy gapps to correct folder for build
-#        cp -Rfv ../tmp/gapps vendor/
-#        . build/envsetup.sh
-#        lunch treble_a64_bgN-ap1a-userdebug
-#        make systemimage -j"$(nproc --all)"
-#        mv -v out/target/product/tdgsi_a64_ab/system.img ../tmp/system_gapps_arm32_binder64.img
-#        # remove gapps folder to avoid contaminating next build
-#        rm -Rfv vendor/gapps
-#      working-directory: src
-#    - name: adapt vndklite vanilla arm64 image
-#      run: |
-#        cp -v ../../tmp/system_vanilla_arm64.img standard_system_vanilla_arm64.img
-#        sudo bash lite-adapter.sh 64 standard_system_vanilla_arm64.img
-#        sudo mv s.img ../../tmp/s_vanilla_arm64_vndklite.img
-#        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_vanilla_arm64_vndklite.img
-#      working-directory: src/treble_adapter
-#    - name: adapt vndklite microg arm64 image
-#      run: |
-#        cp -v ../../tmp/system_microg_arm64.img standard_system_microg_arm64.img
-#        sudo bash lite-adapter.sh 64 standard_system_microg_arm64.img
-#        sudo mv s.img ../../tmp/s_microg_arm64_vndklite.img
-#        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_microg_arm64_vndklite.img
-#      working-directory: src/treble_adapter
-#    - name: adapt vndklite gapps arm64 image
-#      run: |
-#        cp -v ../../tmp/system_gapps_arm64.img standard_system_gapps_arm64.img
-#        sudo bash lite-adapter.sh 64 standard_system_gapps_arm64.img
-#        sudo mv s.img ../../tmp/s_gapps_arm64_vndklite.img
-#        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_gapps_arm64_vndklite.img
-#      working-directory: src/treble_adapter
-#    - name: adapt vndklite vanilla arm32_binder64 image
-#      run: |
-#        cp -v ../../tmp/system_vanilla_arm32_binder64.img standard_system_vanilla_arm32_binder64.img
-#        sudo bash lite-adapter.sh 32 standard_system_vanilla_arm32_binder64.img
-#        sudo mv s.img ../../tmp/s_vanilla_arm32_binder64_vndklite.img
-#        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_vanilla_arm32_binder64_vndklite.img
-#      working-directory: src/treble_adapter
-#    - name: adapt microg vanilla arm32_binder64 image
-#      run: |
-#        cp -v ../../tmp/system_microg_arm32_binder64.img standard_system_microg_arm32_binder64.img
-#        sudo bash lite-adapter.sh 32 standard_system_microg_arm32_binder64.img
-#        sudo mv s.img ../../tmp/s_microg_arm32_binder64_vndklite.img
-#        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_microg_arm32_binder64_vndklite.img
-#      working-directory: src/treble_adapter
-#    - name: adapt vndklite gapps arm32_binder64 image
-#      run: |
-#        cp -v ../../tmp/system_gapps_arm32_binder64.img standard_system_gapps_arm32_binder64.img
-#        sudo bash lite-adapter.sh 32 standard_system_gapps_arm32_binder64.img
-#        sudo mv s.img ../../tmp/s_gapps_arm32_binder64_vndklite.img
-#        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_gapps_arm32_binder64_vndklite.img
-#      working-directory: src/treble_adapter
+    - name: build standard microg arm64 image
+      run: |
+        # copy microg config
+        pushd device/phh/treble
+          cp -fv ../../../../configs/voltage-microg.mk voltage.mk
+          bash generate.sh voltage
+        popd
+
+        # copy microg to correct folder for build
+        cp -Rfv ../tmp/partner_gms vendor/
+
+        . build/envsetup.sh
+        lunch treble_arm64_bmN-ap1a-userdebug
+        make systemimage -j"$(nproc --all)"
+        mv -v out/target/product/tdgsi_arm64_ab/system.img ../tmp/system_microg_arm64.img
+        # remove microg folder to avoid contaminating next build
+        rm -Rfv vendor/partner_gms
+      working-directory: src
+    - name: build standard gapps arm64 image
+      run: |
+        # copy gapps config
+        pushd device/phh/treble
+          cp -fv ../../../../configs/voltage-gapps.mk voltage.mk
+          bash generate.sh voltage
+        popd
+
+        # copy gapps to correct folder for build
+        cp -Rfv ../tmp/gapps vendor/
+        . build/envsetup.sh
+        lunch treble_arm64_bgN-ap1a-userdebug
+        make systemimage -j"$(nproc --all)"
+        mv -v out/target/product/tdgsi_arm64_ab/system.img ../tmp/system_gapps_arm64.img
+        # remove gapps folder to avoid contaminating next build
+        rm -Rfv vendor/gapps
+      working-directory: src
+    - name: build standard vanilla arm32_binder64 image
+      run: |
+        # copy vanilla config
+        pushd device/phh/treble
+          cp -fv ../../../../configs/voltage-vanilla.mk voltage.mk
+          bash generate.sh voltage
+        popd
+
+        . build/envsetup.sh
+        lunch treble_a64_bvN-ap1a-userdebug
+        make systemimage -j"$(nproc --all)"
+        mv -v out/target/product/tdgsi_a64_ab/system.img ../tmp/system_vanilla_arm32_binder64.img
+      working-directory: src
+    - name: build standard microg arm32_binder64 image
+      run: |
+        # copy microg config
+        pushd device/phh/treble
+          cp -fv ../../../../configs/voltage-microg.mk voltage.mk
+          bash generate.sh voltage
+        popd
+
+        # copy microg to correct folder for build
+        cp -Rfv ../tmp/partner_gms vendor/
+        . build/envsetup.sh
+        lunch treble_a64_bmN-ap1a-userdebug
+        make systemimage -j"$(nproc --all)"
+        mv -v out/target/product/tdgsi_a64_ab/system.img ../tmp/system_microg_arm32_binder64.img
+         # remove microg folder to avoid contaminating next build
+        rm -Rfv vendor/partner_gms
+      working-directory: src
+    - name: build standard gapps arm32_binder64 image
+      run: |
+        # copy gapps config
+        pushd device/phh/treble
+          cp -fv ../../../../configs/voltage-gapps.mk voltage.mk
+          bash generate.sh voltage
+        popd
+
+        # copy gapps to correct folder for build
+        cp -Rfv ../tmp/gapps vendor/
+        . build/envsetup.sh
+        lunch treble_a64_bgN-ap1a-userdebug
+        make systemimage -j"$(nproc --all)"
+        mv -v out/target/product/tdgsi_a64_ab/system.img ../tmp/system_gapps_arm32_binder64.img
+        # remove gapps folder to avoid contaminating next build
+        rm -Rfv vendor/gapps
+      working-directory: src
+    - name: adapt vndklite vanilla arm64 image
+      run: |
+        cp -v ../../tmp/system_vanilla_arm64.img standard_system_vanilla_arm64.img
+        sudo bash lite-adapter.sh 64 standard_system_vanilla_arm64.img
+        sudo mv s.img ../../tmp/s_vanilla_arm64_vndklite.img
+        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_vanilla_arm64_vndklite.img
+      working-directory: src/treble_adapter
+    - name: adapt vndklite microg arm64 image
+      run: |
+        cp -v ../../tmp/system_microg_arm64.img standard_system_microg_arm64.img
+        sudo bash lite-adapter.sh 64 standard_system_microg_arm64.img
+        sudo mv s.img ../../tmp/s_microg_arm64_vndklite.img
+        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_microg_arm64_vndklite.img
+      working-directory: src/treble_adapter
+    - name: adapt vndklite gapps arm64 image
+      run: |
+        cp -v ../../tmp/system_gapps_arm64.img standard_system_gapps_arm64.img
+        sudo bash lite-adapter.sh 64 standard_system_gapps_arm64.img
+        sudo mv s.img ../../tmp/s_gapps_arm64_vndklite.img
+        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_gapps_arm64_vndklite.img
+      working-directory: src/treble_adapter
+    - name: adapt vndklite vanilla arm32_binder64 image
+      run: |
+        cp -v ../../tmp/system_vanilla_arm32_binder64.img standard_system_vanilla_arm32_binder64.img
+        sudo bash lite-adapter.sh 32 standard_system_vanilla_arm32_binder64.img
+        sudo mv s.img ../../tmp/s_vanilla_arm32_binder64_vndklite.img
+        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_vanilla_arm32_binder64_vndklite.img
+      working-directory: src/treble_adapter
+    - name: adapt microg vanilla arm32_binder64 image
+      run: |
+        cp -v ../../tmp/system_microg_arm32_binder64.img standard_system_microg_arm32_binder64.img
+        sudo bash lite-adapter.sh 32 standard_system_microg_arm32_binder64.img
+        sudo mv s.img ../../tmp/s_microg_arm32_binder64_vndklite.img
+        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_microg_arm32_binder64_vndklite.img
+      working-directory: src/treble_adapter
+    - name: adapt vndklite gapps arm32_binder64 image
+      run: |
+        cp -v ../../tmp/system_gapps_arm32_binder64.img standard_system_gapps_arm32_binder64.img
+        sudo bash lite-adapter.sh 32 standard_system_gapps_arm32_binder64.img
+        sudo mv s.img ../../tmp/s_gapps_arm32_binder64_vndklite.img
+        sudo chown $(whoami):$(id | awk -F'[()]' '{ print $2 }') ../../tmp/s_gapps_arm32_binder64_vndklite.img
+      working-directory: src/treble_adapter
     - name: rename image files
       run: |
         buildDate=$(cat cachedBuildDate.txt)
         # arm64 - standard
         mv -v system_vanilla_arm64.img "${ROM_NAME}"-vanilla-arm64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        mv -v system_microg_arm64.img "${ROM_NAME}"-microg-arm64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        mv -v system_gapps_arm64.img "${ROM_NAME}"-gapps-arm64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v system_microg_arm64.img "${ROM_NAME}"-microg-arm64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v system_gapps_arm64.img "${ROM_NAME}"-gapps-arm64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
         # arm32_binder64 - standard
-#        mv -v system_vanilla_arm32_binder64.img "${ROM_NAME}"-vanilla-arm32_binder64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        mv -v system_microg_arm32_binder64.img "${ROM_NAME}"-microg-arm32_binder64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        mv -v system_gapps_arm32_binder64.img "${ROM_NAME}"-gapps-arm32_binder64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        # arm64 - vndklite
-#        mv -v s_vanilla_arm64_vndklite.img "${ROM_NAME}"-vanilla-arm64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        mv -v s_microg_arm64_vndklite.img "${ROM_NAME}"-microg-arm64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        mv -v s_gapps_arm64_vndklite.img "${ROM_NAME}"-gapps-arm64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        # arm32_binder64 - vndklite
-#        mv -v s_vanilla_arm32_binder64_vndklite.img "${ROM_NAME}"-vanilla-arm32_binder64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        mv -v s_microg_arm32_binder64_vndklite.img "${ROM_NAME}"-microg-arm32_binder64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
-#        mv -v s_gapps_arm32_binder64_vndklite.img "${ROM_NAME}"-gapps-arm32_binder64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v system_vanilla_arm32_binder64.img "${ROM_NAME}"-vanilla-arm32_binder64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v system_microg_arm32_binder64.img "${ROM_NAME}"-microg-arm32_binder64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v system_gapps_arm32_binder64.img "${ROM_NAME}"-gapps-arm32_binder64-ab-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        # arm64 - vndklite
+        mv -v s_vanilla_arm64_vndklite.img "${ROM_NAME}"-vanilla-arm64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v s_microg_arm64_vndklite.img "${ROM_NAME}"-microg-arm64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v s_gapps_arm64_vndklite.img "${ROM_NAME}"-gapps-arm64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        # arm32_binder64 - vndklite
+        mv -v s_vanilla_arm32_binder64_vndklite.img "${ROM_NAME}"-vanilla-arm32_binder64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v s_microg_arm32_binder64_vndklite.img "${ROM_NAME}"-microg-arm32_binder64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
+        mv -v s_gapps_arm32_binder64_vndklite.img "${ROM_NAME}"-gapps-arm32_binder64-ab-vndklite-"${ROM_VERSION}"-"${buildDate}"-UNOFFICIAL.img
       working-directory: tmp
     - name: compress all images with xz
       run: find . -maxdepth 1 -name '*.img' -exec xz -9 -T0 -v -z "{}" \;
diff --git a/configs/manifest.xml b/configs/manifest.xml
index 658b953..bf7cd68 100644
--- a/configs/manifest.xml
+++ b/configs/manifest.xml
@@ -32,8 +32,8 @@
   <remove-project name="LineageOS/android_external_chromium-webview_prebuilt_x86_64" />
   <project path="external/mulch-webview" name="mulch" remote="divested-mobile" revision="master" clone-depth="1" />
 
-  <!-- grapheneos: apps -->
-  <project path="external/Apps" name="platform_external_Apps" remote="grapheneos" revision="14" clone-depth="1" />
+  <!-- grapheneos: app store -->
+  <project path="external/Apps" name="platform_external_AppStore" remote="grapheneos" revision="14" clone-depth="1" />
 
   <!-- lineageos4microg: microg -->
   <project path="vendor/partner_gms" name="android_vendor_partner_gms" remote="lineageos4microg" revision="master" clone-depth="1" />
diff --git a/configs/voltage-vanilla.mk b/configs/voltage-vanilla.mk
index 2ec9a78..9e23186 100644
--- a/configs/voltage-vanilla.mk
+++ b/configs/voltage-vanilla.mk
@@ -16,7 +16,7 @@ PRODUCT_PACKAGE_OVERLAYS += \
 
 # Packages
 PRODUCT_PACKAGES += \
-  Apps \
+  AppStore \
   AuroraStorePrivilegedExtension \
   F-DroidPrivilegedExtension \
   OpenEUICC