.gitignore

@@ -0,0 +1 @@
+/local_manifests_device

README.md

@@ -1,31 +1,27 @@
 
-## Building PHH-based LineageOS GSIs ##
+## Building "generic" LineageOS GSIs ##
 
-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).
+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").
 
-First, open a new Terminal window, which defaults to your home directory. Create a new working directory for your LineageOS build and navigate to it:
+Create a new working directory for your LineageOS build and navigate to it:
 
-    mkdir lineage-19.x-build-gsi; cd lineage-19.x-build-gsi
+    mkdir lineage-21-build-gsi; cd lineage-21-build-gsi
 
 Initialize your LineageOS workspace:
 
-    repo init -u https://github.com/LineageOS/android.git -b lineage-19.1 --git-lfs
+    repo init -u https://github.com/LineageOS/android.git -b lineage-21.0 --git-lfs
 
 Clone both this and the patches repos:
 
-    git clone https://github.com/AndyCGYan/lineage_build_unified lineage_build_unified -b lineage-19.1
+    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-19.1
+    git clone https://github.com/AndyCGYan/lineage_patches_unified lineage_patches_unified -b lineage-21-light
 
 Finally, start the build script - for example, to build for all supported archs:
 
-    bash lineage_build_unified/buildbot_unified.sh treble A64VN A64VS A64GN 64VN 64VS 64GN
+    bash lineage_build_unified/buildbot_unified.sh treble 64VN 64VS 64GN
 
 Be sure to update the cloned repos from time to time!
 
 ---
 
-Note: VNDKLite and Secure targets are generated from built 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.

buildbot_unified.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 echo ""
-echo "LineageOS 19.x Unified Buildbot"
+echo "LineageOS 21 Unified Buildbot"
 echo "Executing in 5 seconds - CTRL-C to exit"
 echo ""
 sleep 5
@@ -22,6 +22,7 @@ fi
 
 NOSYNC=false
 PERSONAL=false
+SIGNABLE=true
 for var in "${@:2}"
 do
     if [ ${var} == "nosync" ]
@@ -31,8 +32,14 @@ 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
@@ -45,7 +52,7 @@ echo\
 )' ERR
 
 START=`date +%s`
-BUILD_DATE="$(date +%Y%m%d)"
+BUILD_DATE="$(date -u +%Y%m%d)"
 
 prep_build() {
     echo "Preparing local manifests"
@@ -59,17 +66,14 @@ 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 -t twelve-burnin -r -f
     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 329229 -r -f # Alter model name to avoid SafetyNet HW attestation enforcement
+    repopick 368923 -r -f # Launcher3: Show clear all button in recents overview
-    repopick 329230 -r -f # keystore: Block key attestation for SafetyNet
-    repopick 331534 -r -f # SystemUI: Add support to add/remove QS tiles with one tap
-    repopick 331791 -r -f # Skip checking SystemUI's permission for observing sensor privacy
 }
 
 apply_patches() {
@@ -82,8 +86,7 @@ prep_device() {
 }
 
 prep_treble() {
-    apply_patches patches_treble_prerequisite
+    :
-    apply_patches patches_treble_phh
 }
 
 finalize_device() {
@@ -91,47 +94,34 @@ finalize_device() {
 }
 
 finalize_treble() {
-    cd device/phh/treble
+    :
-    git clean -fdx
-    bash generate.sh lineage
-    cd ../../..
-    cd treble_app
-    bash build.sh release
-    cp TrebleApp.apk ../vendor/hardware_overlay/TrebleApp/app.apk
-    cd ..
-    cd vendor/hardware_overlay
-    git add TrebleApp/app.apk
-    git commit -m "[TEMP] Up TrebleApp to $BUILD_DATE"
-    cd ../..
 }
 
 build_device() {
-    if [ ${1} == "arm64" ]
-    then
-        lunch lineage_arm64-userdebug
-        make -j$(lscpu -b -p=Core,Socket | grep -v '^#' | sort -u | wc -l) systemimage
-        mv $OUT/system.img ~/build-output/lineage-19.1-$BUILD_DATE-UNOFFICIAL-arm64$(${PERSONAL} && echo "-personal" || echo "").img
-    else
     brunch ${1}
-        mv $OUT/lineage-*.zip ~/build-output/lineage-19.1-$BUILD_DATE-UNOFFICIAL-${1}$($PERSONAL && echo "-personal" || echo "").zip
+    mv $OUT/lineage-*.zip ~/build-output/lineage-21.0-$BUILD_DATE-UNOFFICIAL-${1}$($PERSONAL && echo "-personal" || echo "").zip
-    fi
 }
 
 build_treble() {
     case "${1}" in
-        ("A64VN") TARGET=a64_bvN;;
+        ("64VN") TARGET=gsi_arm64_vN;;
-        ("A64VS") TARGET=a64_bvS;;
+        ("64VS") TARGET=gsi_arm64_vS;;
-        ("A64GN") TARGET=a64_bgN;;
+        ("64GN") TARGET=gsi_arm64_gN;;
-        ("64VN") TARGET=arm64_bvN;;
-        ("64VS") TARGET=arm64_bvS;;
-        ("64GN") TARGET=arm64_bgN;;
         (*) echo "Invalid target - exiting"; exit 1;;
     esac
-    lunch lineage_${TARGET}-userdebug
+    lunch lineage_${TARGET}-${aosp_target_release}-userdebug
     make installclean
-    make -j$(nproc --all) systemimage
+    make -j$(lscpu -b -p=Core,Socket | grep -v '^#' | sort -u | wc -l) systemimage
-    mv $OUT/system.img ~/build-output/lineage-19.1-$BUILD_DATE-UNOFFICIAL-${TARGET}$(${PERSONAL} && echo "-personal" || echo "").img
+    SIGNED=false
-    make vndk-test-sepolicy
+    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
 }
 
 if ${NOSYNC}
@@ -140,6 +130,7 @@ then
     echo ""
     echo "Setting up build environment"
     source build/envsetup.sh &> /dev/null
+    source vendor/lineage/vars/aosp_target_release
     echo ""
 else
     prep_build

local_manifests_treble/manifest.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-  <project name="phhusson/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
+  <project name="AndyCGYan/android_device_lineage_gsi" path="device/lineage/gsi" remote="github" revision="lineage-21" />
-  <project name="phhusson/device_phh_treble" path="device/phh/treble" remote="github" revision="android-12.0" />
+  <project name="AndyCGYan/android_packages_apps_QcRilAm" path="packages/apps/QcRilAm" remote="github" revision="master" />
-  <project name="phhusson/vendor_vndk-tests" path="vendor/vndk-tests" remote="github" revision="master" />
+  <project name="TrebleDroid/vendor_hardware_overlay" path="vendor/hardware_overlay" remote="github" revision="pie" />
-  <project name="phhusson/vendor_interfaces" path="vendor/interfaces" remote="github" revision="android-11.0" />
+  <remove-project name="LineageOS/android_packages_apps_Camera2" />
-  <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" />
-  <project name="TrebleDroid/treble_app" path="treble_app" remote="github" revision="master" />
   <remote name="gitlab" fetch="https://gitlab.com/" />
-  <project name="davi.sh/gms-android-12" path="vendor/partner_gms" remote="gitlab" revision="master" />
+  <project name="MindTheGapps/vendor_gapps" path="vendor/gapps" remote="gitlab" revision="upsilon" />
 </manifest>

make_clobber.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+source build/envsetup.sh
+source vendor/lineage/vars/aosp_target_release
+lunch lineage_gsi_arm64-$aosp_target_release-userdebug
+make clobber

sign_target_files.sh

@@ -0,0 +1,132 @@
+#!/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