From 472189399119d73260536bb81a9808a0df9a184d Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Wed, 9 Nov 2022 10:47:25 +0000 Subject: [PATCH] Changes for November 2022 --- README.md | 2 +- buildbot_unified.sh | 13 ++++++------- local_manifests_treble/manifest.xml | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f26c114..a7d3091 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Clone both this and the patches repos: Finally, start the build script - for example, to build for all supported archs: - bash lineage_build_unified/buildbot_unified.sh treble 64VN 64VS + bash lineage_build_unified/buildbot_unified.sh treble 64VN 64VS 64GN Be sure to update the cloned repos from time to time! diff --git a/buildbot_unified.sh b/buildbot_unified.sh index ca1b5e4..8c9ddcc 100755 --- a/buildbot_unified.sh +++ b/buildbot_unified.sh @@ -66,6 +66,7 @@ prep_build() { repopick 321338 -f # Allow disabling important developer notifications repopick 321339 -f # Allow disabling USB notifications repopick 331534 -f # SystemUI: Add support to add/remove QS tiles with one tap + repopick 340916 # SystemUI: add burnIn protection } apply_patches() { @@ -96,13 +97,15 @@ build_device() { build_treble() { case "${1}" in - ("64VN") TARGET=gsi_arm64_vN;; - ("64VS") TARGET=gsi_arm64_vS;; + ("64VN") TARGET=gsi_arm64_vN; SECURE=true;; + ("64VS") TARGET=gsi_arm64_vS; SECURE=false;; + ("64GN") TARGET=gsi_arm64_gN; SECURE=true;; (*) echo "Invalid target - exiting"; exit 1;; esac lunch lineage_${TARGET}-userdebug + make installclean make -j$(nproc --all) systemimage - mv $OUT/system.img ~/build-output/lineage-20.0-$BUILD_DATE-UNOFFICIAL-${TARGET}$(${PERSONAL} && echo "-personal" || echo "").img + mv $OUT/system.img ~/build-output/lineage-20.0-$BUILD_DATE-UNOFFICIAL-${TARGET}$(${SECURE} && echo "-secure" || echo "")$(${PERSONAL} && echo "-personal" || echo "").img } if ${NOSYNC} @@ -138,10 +141,6 @@ do build_${MODE} ${var} done ls ~/build-output | grep 'lineage' || true -if [ ${MODE} == "treble" ] -then - echo $START > ~/build-output/ota-timestamp.txt -fi END=`date +%s` ELAPSEDM=$(($(($END-$START))/60)) diff --git a/local_manifests_treble/manifest.xml b/local_manifests_treble/manifest.xml index 28116cf..78712b2 100644 --- a/local_manifests_treble/manifest.xml +++ b/local_manifests_treble/manifest.xml @@ -4,4 +4,6 @@ + +