7 changed files with 71 additions and 219 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-/local_manifests_device
--- a/README.md
+++ b/README.md
@ -1,27 +1,35 @@

-## Building "generic" LineageOS GSIs ##
+## Building PHH-based LineageOS GSIs ##

-Set up your environment by referring to [LineageOS Wiki](https://wiki.lineageos.org/devices/TP1803/build) (mainly "Install the build packages" and "Install the repo command").
+To get started with building LineageOS GSI, you'll need to get familiar with [Git and Repo](https://source.android.com/source/using-repo.html), and set up your environment by referring to [LineageOS Wiki](https://wiki.lineageos.org/devices/redfin/build) (mainly "Install the build packages") and [How to build a GSI](https://github.com/phhusson/treble_experimentations/wiki/How-to-build-a-GSI%3F).
+
+First, open a new Terminal window, which defaults to your home directory.  Clone the modified treble_experimentations repo there:
+
+    git clone https://github.com/AndyCGYan/treble_experimentations

 Create a new working directory for your LineageOS build and navigate to it:

-    mkdir lineage-21-build-gsi; cd lineage-21-build-gsi
+    mkdir lineage-18.x-build-gsi; cd lineage-18.x-build-gsi

 Initialize your LineageOS workspace:

-    repo init -u https://github.com/LineageOS/android.git -b lineage-21.0 --git-lfs
+    repo init -u https://github.com/LineageOS/android.git -b lineage-18.1

 Clone both this and the patches repos:

-    git clone https://github.com/AndyCGYan/lineage_build_unified lineage_build_unified -b lineage-21-light
-    git clone https://github.com/AndyCGYan/lineage_patches_unified lineage_patches_unified -b lineage-21-light
+    git clone https://github.com/AndyCGYan/lineage_build_unified lineage_build_unified -b lineage-18.1
+    git clone https://github.com/AndyCGYan/lineage_patches_unified lineage_patches_unified -b lineage-18.1

 Finally, start the build script - for example, to build for all supported archs:

-    bash lineage_build_unified/buildbot_unified.sh treble 64VN 64VS 64GN
+    bash lineage_build_unified/buildbot_unified.sh treble 32B A64B 64B

 Be sure to update the cloned repos from time to time!

 ---

+Note: A-only and VNDKLite targets are generated from AB images instead of source-built - refer to [sas-creator](https://github.com/AndyCGYan/sas-creator).
+
+---
+
 This script is also used to make device-specific and/or personal builds. To do so, understand the script, and try the `device` and `personal` keywords.
--- a/apply_patches.sh
+++ b/apply_patches.sh
@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e
-
-patches="$(readlink -f -- $1)"
-
-shopt -s nullglob
-for project in $(cd $patches; echo *);do
-	p="$(tr _ / <<<$project |sed -e 's;platform/;;g')"
-	[ "$p" == build ] && p=build/make
-	[ "$p" == frameworks/proto/logging ] && p=frameworks/proto_logging
-	[ "$p" == treble/app ] && p=treble_app
-	[ "$p" == vendor/hardware/overlay ] && p=vendor/hardware_overlay
-	[ "$p" == vendor/partner/gms ] && p=vendor/partner_gms
-	pushd $p
-	git clean -fdx; git reset --hard
-	for patch in $patches/$project/*.patch;do
-		if git apply --check $patch;then
-			git am $patch
-		elif patch -f -p1 --dry-run < $patch > /dev/null;then
-			#This will fail
-			git am $patch || true
-			patch -f -p1 < $patch
-			git add -u
-			git am --continue
-		else
-			echo "Failed applying $patch"
-			exit 1
-		fi
-	done
-	popd
-done
-
--- a/buildbot_unified.sh
+++ b/buildbot_unified.sh
@ -1,6 +1,6 @@
 #!/bin/bash
 echo ""
-echo "LineageOS 21 Unified Buildbot"
+echo "LineageOS 19.x Unified Buildbot"
 echo "Executing in 5 seconds - CTRL-C to exit"
 echo ""
 sleep 5
@ -22,7 +22,6 @@ fi

 NOSYNC=false
 PERSONAL=false
-SIGNABLE=true
 for var in "${@:2}"
 do
    if [ ${var} == "nosync" ]
@ -32,14 +31,8 @@ do
    if [ ${var} == "personal" ]
    then
        PERSONAL=true
-        SIGNABLE=false
    fi
 done
-if [ ! -d "$HOME/.android-certs" ]; then
-    read -n1 -r -p $"\$HOME/.android-certs not found - CTRL-C to exit, or any other key to continue"
-    echo ""
-    SIGNABLE=false
-fi

 # Abort early on error
 set -eE
@ -52,7 +45,9 @@ echo\
 )' ERR

 START=`date +%s`
-BUILD_DATE="$(date -u +%Y%m%d)"
+BUILD_DATE="$(date +%Y%m%d)"
+WITHOUT_CHECK_API=true
+WITH_SU=true

 prep_build() {
    echo "Preparing local manifests"
@ -66,19 +61,32 @@ prep_build() {

    echo "Setting up build environment"
    source build/envsetup.sh &> /dev/null
-    source vendor/lineage/vars/aosp_target_release
    mkdir -p ~/build-output
    echo ""

-    repopick 321337 -r -f # Deprioritize important developer notifications
-    repopick 321338 -r -f # Allow disabling important developer notifications
-    repopick 321339 -r -f # Allow disabling USB notifications
-    repopick 368923 -r -f # Launcher3: Show clear all button in recents overview
+    repopick -t twelve-monet
+    repopick -Q "status:open+project:LineageOS/android_packages_apps_AudioFX+branch:lineage-19.0"
+    repopick -Q "status:open+project:LineageOS/android_packages_apps_Etar+branch:lineage-19.0"
+    repopick -Q "status:open+project:LineageOS/android_packages_apps_Trebuchet+branch:lineage-19.0+NOT+317783+NOT+318747"
+    repopick -t twelve-burnin
+    repopick -t twelve-buttons
+    repopick -t twelve-fingerprint
+    repopick -t twelve-volume-panel-location
+    repopick -t twelve-swap-volume-buttons
+    repopick -t twelve-camera-button
+    repopick -t twelve-navbar-runtime-toggle
+    repopick -t twelve-buttons-lights
+    repopick -t twelve-keyboard-lights
+    repopick -t twelve-statusbar-brightness-and-qs-slider
+    repopick -t twelve-powermenu
+    repopick 321337 # Deprioritize important developer notifications
+    repopick 321338 # Allow disabling important developer notifications
+    repopick 321339 # Allow disabling USB notifications
 }

 apply_patches() {
    echo "Applying patch group ${1}"
-    bash ./lineage_build_unified/apply_patches.sh ./lineage_patches_unified/${1}
+    bash ~/treble_experimentations/apply-patches.sh ./lineage_patches_unified/${1}
 }

 prep_device() {
@ -86,7 +94,8 @@ prep_device() {
 }

 prep_treble() {
-    :
+    apply_patches patches_treble_prerequisite
+    apply_patches patches_treble_phh
 }

 finalize_device() {
@ -94,34 +103,38 @@ finalize_device() {
 }

 finalize_treble() {
-    :
+    rm -f device/*/sepolicy/common/private/genfs_contexts
+    cd device/phh/treble
+    git clean -fdx
+    bash generate.sh lineage
+    cd ../../..
 }

 build_device() {
-    brunch ${1}
-    mv $OUT/lineage-*.zip ~/build-output/lineage-21.0-$BUILD_DATE-UNOFFICIAL-${1}$($PERSONAL && echo "-personal" || echo "").zip
+    if [ ${1} == "arm64" ]
+    then
+        lunch lineage_arm64-userdebug
+        make -j$(nproc --all) systemimage
+        mv $OUT/system.img ~/build-output/lineage-19.0-$BUILD_DATE-UNOFFICIAL-arm64$(${PERSONAL} && echo "-personal" || echo "").img
+    else
+        brunch ${1}
+        mv $OUT/lineage-*.zip ~/build-output/lineage-19.0-$BUILD_DATE-UNOFFICIAL-${1}$($PERSONAL && echo "-personal" || echo "").zip
+    fi
 }

 build_treble() {
    case "${1}" in
-        ("64VN") TARGET=gsi_arm64_vN;;
-        ("64VS") TARGET=gsi_arm64_vS;;
-        ("64GN") TARGET=gsi_arm64_gN;;
+        ("A64B") TARGET=treble_a64_bvS;;
+        ("A64BG") TARGET=treble_a64_bgS;;
+        ("64B") TARGET=treble_arm64_bvS;;
+        ("64BG") TARGET=treble_arm64_bgS;;
        (*) echo "Invalid target - exiting"; exit 1;;
    esac
-    lunch lineage_${TARGET}-${aosp_target_release}-userdebug
+    lunch lineage_${TARGET}-userdebug
    make installclean
-    make -j$(lscpu -b -p=Core,Socket | grep -v '^#' | sort -u | wc -l) systemimage
-    SIGNED=false
-    if [ ${SIGNABLE} = true ] && [[ ${TARGET} == *_g? ]]
-    then
-        make -j$(lscpu -b -p=Core,Socket | grep -v '^#' | sort -u | wc -l) target-files-package otatools
-        bash ./lineage_build_unified/sign_target_files.sh $OUT/signed-target_files.zip
-        unzip -joq $OUT/signed-target_files.zip IMAGES/system.img -d $OUT
-        SIGNED=true
-        echo ""
-    fi
-    mv $OUT/system.img ~/build-output/lineage-21.0-$BUILD_DATE-UNOFFICIAL-${TARGET}$(${PERSONAL} && echo "-personal" || echo "")$(${SIGNED} && echo "-signed" || echo "").img
+    make -j$(nproc --all) systemimage
+    mv $OUT/system.img ~/build-output/lineage-19.0-$BUILD_DATE-UNOFFICIAL-${TARGET}$(${PERSONAL} && echo "-personal" || echo "").img
+    make vndk-test-sepolicy
 }

 if ${NOSYNC}
@ -130,7 +143,6 @@ then
    echo ""
    echo "Setting up build environment"
    source build/envsetup.sh &> /dev/null
-    source vendor/lineage/vars/aosp_target_release
    echo ""
 else
    prep_build
--- a/local_manifests_treble/manifest.xml
+++ b/local_manifests_treble/manifest.xml
@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <project name="AndyCGYan/android_device_lineage_gsi" path="device/lineage/gsi" remote="github" revision="lineage-21" />
-  <project name="AndyCGYan/android_packages_apps_QcRilAm" path="packages/apps/QcRilAm" remote="github" revision="master" />
-  <project name="TrebleDroid/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
-  <remove-project name="LineageOS/android_packages_apps_Camera2" />
+  <project name="phhusson/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
+  <project name="phhusson/device_phh_treble" path="device/phh/treble" remote="github" revision="android-12.0" />
+  <project name="phhusson/vendor_vndk-tests" path="vendor/vndk-tests" remote="github" revision="master" />
+  <project name="phhusson/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-11.0" />
+  <project name="phhusson/vendor_lptools" path="vendor/lptools" remote="github" revision="master" />
+  <project name="phhusson/vendor_magisk" path="vendor/magisk" remote="github" revision="android-10.0" />
  <remote name="gitlab" fetch="https://gitlab.com/" />
-  <project name="MindTheGapps/vendor_gapps" path="vendor/gapps" remote="gitlab" revision="upsilon" />
+  <project name="davi.sh/gms-android-12" path="vendor/partner_gms" remote="gitlab" revision="master" />
+  <remove-project name="platform/packages/apps/Gallery2" />
+  <project name="LineageOS/android_packages_apps_Gallery2" path="packages/apps/Gallery2" remote="github" revision="lineage-18.1" />
 </manifest>
--- a/make_clobber.sh
+++ b/make_clobber.sh
@ -1,6 +0,0 @@
-#!/bin/bash
-
-source build/envsetup.sh
-source vendor/lineage/vars/aosp_target_release
-lunch lineage_gsi_arm64-$aosp_target_release-userdebug
-make clobber
--- a/sign_target_files.sh
+++ b/sign_target_files.sh
@ -1,132 +0,0 @@
-#!/bin/bash
-
-OUTFILE="$1"
-
-if [ -z "$OUTFILE" ]; then
-    OUTFILE="signed-target_files.zip"
-fi
-
-sign_target_files_apks -o -d ~/.android-certs --allow_gsi_debug_sepolicy \
-    --extra_apks AdServicesApk.apk=$HOME/.android-certs/releasekey \
-    --extra_apks FederatedCompute.apk=$HOME/.android-certs/releasekey \
-    --extra_apks HalfSheetUX.apk=$HOME/.android-certs/releasekey \
-    --extra_apks HealthConnectBackupRestore.apk=$HOME/.android-certs/releasekey \
-    --extra_apks HealthConnectController.apk=$HOME/.android-certs/releasekey \
-    --extra_apks OsuLogin.apk=$HOME/.android-certs/releasekey \
-    --extra_apks SafetyCenterResources.apk=$HOME/.android-certs/releasekey \
-    --extra_apks ServiceConnectivityResources.apk=$HOME/.android-certs/releasekey \
-    --extra_apks ServiceUwbResources.apk=$HOME/.android-certs/releasekey \
-    --extra_apks ServiceWifiResources.apk=$HOME/.android-certs/releasekey \
-    --extra_apks WifiDialog.apk=$HOME/.android-certs/releasekey \
-    --extra_apks com.android.adbd.apex=$HOME/.android-certs/com.android.adbd \
-    --extra_apks com.android.adservices.apex=$HOME/.android-certs/com.android.adservices \
-    --extra_apks com.android.adservices.api.apex=$HOME/.android-certs/com.android.adservices.api \
-    --extra_apks com.android.appsearch.apex=$HOME/.android-certs/com.android.appsearch \
-    --extra_apks com.android.art.apex=$HOME/.android-certs/com.android.art \
-    --extra_apks com.android.bluetooth.apex=$HOME/.android-certs/com.android.bluetooth \
-    --extra_apks com.android.btservices.apex=$HOME/.android-certs/com.android.btservices \
-    --extra_apks com.android.cellbroadcast.apex=$HOME/.android-certs/com.android.cellbroadcast \
-    --extra_apks com.android.compos.apex=$HOME/.android-certs/com.android.compos \
-    --extra_apks com.android.configinfrastructure.apex=$HOME/.android-certs/com.android.configinfrastructure \
-    --extra_apks com.android.connectivity.resources.apex=$HOME/.android-certs/com.android.connectivity.resources \
-    --extra_apks com.android.conscrypt.apex=$HOME/.android-certs/com.android.conscrypt \
-    --extra_apks com.android.devicelock.apex=$HOME/.android-certs/com.android.devicelock \
-    --extra_apks com.android.extservices.apex=$HOME/.android-certs/com.android.extservices \
-    --extra_apks com.android.graphics.pdf.apex=$HOME/.android-certs/com.android.graphics.pdf \
-    --extra_apks com.android.hardware.biometrics.face.virtual.apex=$HOME/.android-certs/com.android.hardware.biometrics.face.virtual \
-    --extra_apks com.android.hardware.biometrics.fingerprint.virtual.apex=$HOME/.android-certs/com.android.hardware.biometrics.fingerprint.virtual \
-    --extra_apks com.android.hardware.boot.apex=$HOME/.android-certs/com.android.hardware.boot \
-    --extra_apks com.android.hardware.cas.apex=$HOME/.android-certs/com.android.hardware.cas \
-    --extra_apks com.android.hardware.wifi.apex=$HOME/.android-certs/com.android.hardware.wifi \
-    --extra_apks com.android.healthfitness.apex=$HOME/.android-certs/com.android.healthfitness \
-    --extra_apks com.android.hotspot2.osulogin.apex=$HOME/.android-certs/com.android.hotspot2.osulogin \
-    --extra_apks com.android.i18n.apex=$HOME/.android-certs/com.android.i18n \
-    --extra_apks com.android.ipsec.apex=$HOME/.android-certs/com.android.ipsec \
-    --extra_apks com.android.media.apex=$HOME/.android-certs/com.android.media \
-    --extra_apks com.android.media.swcodec.apex=$HOME/.android-certs/com.android.media.swcodec \
-    --extra_apks com.android.mediaprovider.apex=$HOME/.android-certs/com.android.mediaprovider \
-    --extra_apks com.android.nearby.halfsheet.apex=$HOME/.android-certs/com.android.nearby.halfsheet \
-    --extra_apks com.android.networkstack.tethering.apex=$HOME/.android-certs/com.android.networkstack.tethering \
-    --extra_apks com.android.neuralnetworks.apex=$HOME/.android-certs/com.android.neuralnetworks \
-    --extra_apks com.android.ondevicepersonalization.apex=$HOME/.android-certs/com.android.ondevicepersonalization \
-    --extra_apks com.android.os.statsd.apex=$HOME/.android-certs/com.android.os.statsd \
-    --extra_apks com.android.permission.apex=$HOME/.android-certs/com.android.permission \
-    --extra_apks com.android.resolv.apex=$HOME/.android-certs/com.android.resolv \
-    --extra_apks com.android.rkpd.apex=$HOME/.android-certs/com.android.rkpd \
-    --extra_apks com.android.runtime.apex=$HOME/.android-certs/com.android.runtime \
-    --extra_apks com.android.safetycenter.resources.apex=$HOME/.android-certs/com.android.safetycenter.resources \
-    --extra_apks com.android.scheduling.apex=$HOME/.android-certs/com.android.scheduling \
-    --extra_apks com.android.sdkext.apex=$HOME/.android-certs/com.android.sdkext \
-    --extra_apks com.android.support.apexer.apex=$HOME/.android-certs/com.android.support.apexer \
-    --extra_apks com.android.telephony.apex=$HOME/.android-certs/com.android.telephony \
-    --extra_apks com.android.telephonymodules.apex=$HOME/.android-certs/com.android.telephonymodules \
-    --extra_apks com.android.tethering.apex=$HOME/.android-certs/com.android.tethering \
-    --extra_apks com.android.tzdata.apex=$HOME/.android-certs/com.android.tzdata \
-    --extra_apks com.android.uwb.apex=$HOME/.android-certs/com.android.uwb \
-    --extra_apks com.android.uwb.resources.apex=$HOME/.android-certs/com.android.uwb.resources \
-    --extra_apks com.android.virt.apex=$HOME/.android-certs/com.android.virt \
-    --extra_apks com.android.vndk.current.apex=$HOME/.android-certs/com.android.vndk.current \
-    --extra_apks com.android.vndk.current.on_vendor.apex=$HOME/.android-certs/com.android.vndk.current.on_vendor \
-    --extra_apks com.android.wifi.apex=$HOME/.android-certs/com.android.wifi \
-    --extra_apks com.android.wifi.dialog.apex=$HOME/.android-certs/com.android.wifi.dialog \
-    --extra_apks com.android.wifi.resources.apex=$HOME/.android-certs/com.android.wifi.resources \
-    --extra_apks com.google.pixel.camera.hal.apex=$HOME/.android-certs/com.google.pixel.camera.hal \
-    --extra_apks com.google.pixel.vibrator.hal.apex=$HOME/.android-certs/com.google.pixel.vibrator.hal \
-    --extra_apks com.qorvo.uwb.apex=$HOME/.android-certs/com.qorvo.uwb \
-    --extra_apex_payload_key com.android.adbd.apex=$HOME/.android-certs/com.android.adbd.pem \
-    --extra_apex_payload_key com.android.adservices.apex=$HOME/.android-certs/com.android.adservices.pem \
-    --extra_apex_payload_key com.android.adservices.api.apex=$HOME/.android-certs/com.android.adservices.api.pem \
-    --extra_apex_payload_key com.android.appsearch.apex=$HOME/.android-certs/com.android.appsearch.pem \
-    --extra_apex_payload_key com.android.art.apex=$HOME/.android-certs/com.android.art.pem \
-    --extra_apex_payload_key com.android.bluetooth.apex=$HOME/.android-certs/com.android.bluetooth.pem \
-    --extra_apex_payload_key com.android.btservices.apex=$HOME/.android-certs/com.android.btservices.pem \
-    --extra_apex_payload_key com.android.cellbroadcast.apex=$HOME/.android-certs/com.android.cellbroadcast.pem \
-    --extra_apex_payload_key com.android.compos.apex=$HOME/.android-certs/com.android.compos.pem \
-    --extra_apex_payload_key com.android.configinfrastructure.apex=$HOME/.android-certs/com.android.configinfrastructure.pem \
-    --extra_apex_payload_key com.android.connectivity.resources.apex=$HOME/.android-certs/com.android.connectivity.resources.pem \
-    --extra_apex_payload_key com.android.conscrypt.apex=$HOME/.android-certs/com.android.conscrypt.pem \
-    --extra_apex_payload_key com.android.devicelock.apex=$HOME/.android-certs/com.android.devicelock.pem \
-    --extra_apex_payload_key com.android.extservices.apex=$HOME/.android-certs/com.android.extservices.pem \
-    --extra_apex_payload_key com.android.graphics.pdf.apex=$HOME/.android-certs/com.android.graphics.pdf.pem \
-    --extra_apex_payload_key com.android.hardware.biometrics.face.virtual.apex=$HOME/.android-certs/com.android.hardware.biometrics.face.virtual.pem \
-    --extra_apex_payload_key com.android.hardware.biometrics.fingerprint.virtual.apex=$HOME/.android-certs/com.android.hardware.biometrics.fingerprint.virtual.pem \
-    --extra_apex_payload_key com.android.hardware.boot.apex=$HOME/.android-certs/com.android.hardware.boot.pem \
-    --extra_apex_payload_key com.android.hardware.cas.apex=$HOME/.android-certs/com.android.hardware.cas.pem \
-    --extra_apex_payload_key com.android.hardware.wifi.apex=$HOME/.android-certs/com.android.hardware.wifi.pem \
-    --extra_apex_payload_key com.android.healthfitness.apex=$HOME/.android-certs/com.android.healthfitness.pem \
-    --extra_apex_payload_key com.android.hotspot2.osulogin.apex=$HOME/.android-certs/com.android.hotspot2.osulogin.pem \
-    --extra_apex_payload_key com.android.i18n.apex=$HOME/.android-certs/com.android.i18n.pem \
-    --extra_apex_payload_key com.android.ipsec.apex=$HOME/.android-certs/com.android.ipsec.pem \
-    --extra_apex_payload_key com.android.media.apex=$HOME/.android-certs/com.android.media.pem \
-    --extra_apex_payload_key com.android.media.swcodec.apex=$HOME/.android-certs/com.android.media.swcodec.pem \
-    --extra_apex_payload_key com.android.mediaprovider.apex=$HOME/.android-certs/com.android.mediaprovider.pem \
-    --extra_apex_payload_key com.android.nearby.halfsheet.apex=$HOME/.android-certs/com.android.nearby.halfsheet.pem \
-    --extra_apex_payload_key com.android.networkstack.tethering.apex=$HOME/.android-certs/com.android.networkstack.tethering.pem \
-    --extra_apex_payload_key com.android.neuralnetworks.apex=$HOME/.android-certs/com.android.neuralnetworks.pem \
-    --extra_apex_payload_key com.android.ondevicepersonalization.apex=$HOME/.android-certs/com.android.ondevicepersonalization.pem \
-    --extra_apex_payload_key com.android.os.statsd.apex=$HOME/.android-certs/com.android.os.statsd.pem \
-    --extra_apex_payload_key com.android.permission.apex=$HOME/.android-certs/com.android.permission.pem \
-    --extra_apex_payload_key com.android.resolv.apex=$HOME/.android-certs/com.android.resolv.pem \
-    --extra_apex_payload_key com.android.rkpd.apex=$HOME/.android-certs/com.android.rkpd.pem \
-    --extra_apex_payload_key com.android.runtime.apex=$HOME/.android-certs/com.android.runtime.pem \
-    --extra_apex_payload_key com.android.safetycenter.resources.apex=$HOME/.android-certs/com.android.safetycenter.resources.pem \
-    --extra_apex_payload_key com.android.scheduling.apex=$HOME/.android-certs/com.android.scheduling.pem \
-    --extra_apex_payload_key com.android.sdkext.apex=$HOME/.android-certs/com.android.sdkext.pem \
-    --extra_apex_payload_key com.android.support.apexer.apex=$HOME/.android-certs/com.android.support.apexer.pem \
-    --extra_apex_payload_key com.android.telephony.apex=$HOME/.android-certs/com.android.telephony.pem \
-    --extra_apex_payload_key com.android.telephonymodules.apex=$HOME/.android-certs/com.android.telephonymodules.pem \
-    --extra_apex_payload_key com.android.tethering.apex=$HOME/.android-certs/com.android.tethering.pem \
-    --extra_apex_payload_key com.android.tzdata.apex=$HOME/.android-certs/com.android.tzdata.pem \
-    --extra_apex_payload_key com.android.uwb.apex=$HOME/.android-certs/com.android.uwb.pem \
-    --extra_apex_payload_key com.android.uwb.resources.apex=$HOME/.android-certs/com.android.uwb.resources.pem \
-    --extra_apex_payload_key com.android.virt.apex=$HOME/.android-certs/com.android.virt.pem \
-    --extra_apex_payload_key com.android.vndk.current.apex=$HOME/.android-certs/com.android.vndk.current.pem \
-    --extra_apex_payload_key com.android.vndk.current.on_vendor.apex=$HOME/.android-certs/com.android.vndk.current.on_vendor.pem \
-    --extra_apex_payload_key com.android.wifi.apex=$HOME/.android-certs/com.android.wifi.pem \
-    --extra_apex_payload_key com.android.wifi.dialog.apex=$HOME/.android-certs/com.android.wifi.dialog.pem \
-    --extra_apex_payload_key com.android.wifi.resources.apex=$HOME/.android-certs/com.android.wifi.resources.pem \
-    --extra_apex_payload_key com.google.pixel.camera.hal.apex=$HOME/.android-certs/com.google.pixel.camera.hal.pem \
-    --extra_apex_payload_key com.google.pixel.vibrator.hal.apex=$HOME/.android-certs/com.google.pixel.vibrator.hal.pem \
-    --extra_apex_payload_key com.qorvo.uwb.apex=$HOME/.android-certs/com.qorvo.uwb.pem \
-    $OUT/obj/PACKAGING/target_files_intermediates/*-target_files*.zip \
-    $OUTFILE