mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-05-02 06:26:20 -04:00
Small tweaks
- Remove some changes that have been commented for a while - Don't remove the QCOM VR repos - Adjust the default quick tiles - Don't force hardware layers for recents - Only generate deltas for update_engine devices - Cherrypick: Update WebView to 90.0.4430.66 - Adjust yylloc sed line - Add comments to 17.1 devices explaining why they aren't removed for 18.1 yet
This commit is contained in:
Tad
parent
b07a8f3058
commit
bdf990a638
15 changed files with 34 additions and 55 deletions
|
|
@ -216,18 +216,20 @@ processRelease() {
|
|||
|
||||
#Deltas
|
||||
if [ "$DOS_GENERATE_DELTAS" = true ]; then
|
||||
for LAST_TARGET_FILES in $ARCHIVE/target_files/$DOS_BRANDING_ZIP_PREFIX-$VERSION-*-dos-$DEVICE-target_files.zip; do
|
||||
if [[ -f "$LAST_TARGET_FILES.id" ]]; then
|
||||
local LAST_INCREMENTAL_ID=$(cat "$LAST_TARGET_FILES.id");
|
||||
echo -e "\e[0;32mGenerating incremental OTA against $LAST_INCREMENTAL_ID\e[0m";
|
||||
#TODO: Verify GPG signature and checksum of previous target-files first!
|
||||
"$RELEASETOOLS_PREFIX"ota_from_target_files $BLOCK_SWITCHES -t 8 -k "$KEY_DIR/releasekey" -i \
|
||||
"$LAST_TARGET_FILES" \
|
||||
"$OUT_DIR/$PREFIX-target_files.zip" \
|
||||
"$OUT_DIR/$PREFIX-incremental_$LAST_INCREMENTAL_ID.zip";
|
||||
sha512sum "$OUT_DIR/$PREFIX-incremental_$LAST_INCREMENTAL_ID.zip" > "$OUT_DIR/$PREFIX-incremental_$LAST_INCREMENTAL_ID.zip.sha512sum";
|
||||
fi;
|
||||
done;
|
||||
if [[ " ${DOS_GENERATE_DELTAS_DEVICES[@]} " =~ " ${DEVICE} " ]]; then
|
||||
for LAST_TARGET_FILES in $ARCHIVE/target_files/$DOS_BRANDING_ZIP_PREFIX-$VERSION-*-dos-$DEVICE-target_files.zip; do
|
||||
if [[ -f "$LAST_TARGET_FILES.id" ]]; then
|
||||
local LAST_INCREMENTAL_ID=$(cat "$LAST_TARGET_FILES.id");
|
||||
echo -e "\e[0;32mGenerating incremental OTA against $LAST_INCREMENTAL_ID\e[0m";
|
||||
#TODO: Verify GPG signature and checksum of previous target-files first!
|
||||
"$RELEASETOOLS_PREFIX"ota_from_target_files $BLOCK_SWITCHES -t 8 -k "$KEY_DIR/releasekey" -i \
|
||||
"$LAST_TARGET_FILES" \
|
||||
"$OUT_DIR/$PREFIX-target_files.zip" \
|
||||
"$OUT_DIR/$PREFIX-incremental_$LAST_INCREMENTAL_ID.zip";
|
||||
sha512sum "$OUT_DIR/$PREFIX-incremental_$LAST_INCREMENTAL_ID.zip" > "$OUT_DIR/$PREFIX-incremental_$LAST_INCREMENTAL_ID.zip.sha512sum";
|
||||
fi;
|
||||
done;
|
||||
fi;
|
||||
fi;
|
||||
|
||||
#Extract signed recovery
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqba
|
|||
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH
|
||||
|
||||
enterAndClear "external/chromium-webview";
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/57/308057/1; #update webview
|
||||
|
||||
enterAndClear "external/sqlite";
|
||||
patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (AndroidHardening-13.0)
|
||||
|
|
@ -323,7 +323,7 @@ awk -i inplace '!/nfc_enhanced.mk/' device/samsung/toro*/lineage.mk;
|
|||
awk -i inplace '!/TARGET_RECOVERY_UPDATER_LIBS/' device/samsung/toro*/BoardConfig.mk;
|
||||
awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' device/samsung/toro*/BoardConfig.mk;
|
||||
|
||||
sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
|
||||
sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer*; #Fix builds with GCC 10
|
||||
#
|
||||
#END OF DEVICE CHANGES
|
||||
#
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ enterAndClear "device/qcom/sepolicy";
|
|||
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH
|
||||
|
||||
enterAndClear "external/chromium-webview";
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/57/308057/1; #update webview
|
||||
|
||||
enterAndClear "external/svox";
|
||||
git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
|
||||
|
|
@ -259,7 +259,7 @@ sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google
|
|||
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/lge/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
|
||||
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/zte/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
|
||||
|
||||
sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
|
||||
sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer*; #Fix builds with GCC 10
|
||||
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;
|
||||
#
|
||||
#END OF DEVICE CHANGES
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ buildAll() {
|
|||
#SD625
|
||||
buildDevice zenfone3; #broken - ninja: error: 'android.hidl.base@1.0.so', missing and no known rule to make it
|
||||
#SD835
|
||||
buildDevice cheeseburger verity; #needs manual patching - vendor common makefile + 17.1 isn't booting
|
||||
buildDevice cheeseburger verity; #needs manual patching - vendor common makefile + 17.1+ isn't booting
|
||||
buildDevice dumpling verity;
|
||||
#SD845
|
||||
buildDevice beryllium;
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa
|
|||
echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
|
||||
|
||||
enterAndClear "external/chromium-webview";
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/57/308057/1; #update webview
|
||||
|
||||
enterAndClear "external/svox";
|
||||
git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
|
||||
|
|
@ -258,7 +258,7 @@ removeBuildFingerprints;
|
|||
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/asus/msm8953/arch/arm64/configs/*_defconfig; #Breaks on compile
|
||||
sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/yellowstone/arch/arm*/configs/*_defconfig; #Breaks on compile
|
||||
|
||||
sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
|
||||
sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer*; #Fix builds with GCC 10
|
||||
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;
|
||||
#
|
||||
#END OF DEVICE CHANGES
|
||||
|
|
|
|||
|
|
@ -53,20 +53,20 @@ buildAll() {
|
|||
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi;
|
||||
if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi;
|
||||
#SDS4P
|
||||
buildDevice mako;
|
||||
buildDevice mako; #18.1 no cellular
|
||||
#SD410
|
||||
buildDevice crackling;
|
||||
#buildDevice osprey; #needs manual patching + more - mkdir proprietary/priv-app && cp -r proprietary/system/priv-app/qcrilmsgtunnel proprietary/priv-app/
|
||||
#SD801
|
||||
buildDevice FP2;
|
||||
buildDevice m8;
|
||||
buildDevice m8; #18.1 not ready
|
||||
#SD808
|
||||
buildDevice clark;
|
||||
#SD810
|
||||
buildDevice oneplus2;
|
||||
#SD820
|
||||
buildDevice griffin;
|
||||
buildDevice oneplus3 verity;
|
||||
buildDevice oneplus3 verity; #18.1 not compiling
|
||||
buildDevice z2_plus verity;
|
||||
#SD821
|
||||
buildDevice marlin verity;
|
||||
|
|
@ -86,10 +86,10 @@ buildAll() {
|
|||
#SD765
|
||||
buildDevice avicii avb;
|
||||
#SD670
|
||||
buildDevice bonito avb;
|
||||
buildDevice bonito avb; #18.1 not compiling
|
||||
buildDevice sargo avb;
|
||||
#Intel
|
||||
buildDevice fugu; #broken
|
||||
buildDevice fugu;
|
||||
#Tegra
|
||||
buildDevice yellowstone; #broken
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BAS
|
|||
cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/divested/"; #Add our vendor files
|
||||
|
||||
enterAndClear "bootable/recovery";
|
||||
#git revert --no-edit 0335405715fd15b1564c3169b725f7145ebde3af; #Don't allow bypassing signature verification
|
||||
patch -p1 < "$DOS_PATCHES/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch"; #Abort on serial number specific packages (GrapheneOS)
|
||||
|
||||
enterAndClear "bionic";
|
||||
|
|
@ -71,7 +70,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa
|
|||
echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
|
||||
|
||||
enterAndClear "external/chromium-webview";
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/57/308057/1; #update webview
|
||||
|
||||
enterAndClear "external/svox";
|
||||
git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
|
||||
|
|
@ -294,7 +293,7 @@ sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/lge/ma
|
|||
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/motorola/msm8996/arch/arm64/configs/*_defconfig; #Breaks on compile
|
||||
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/oneplus/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
|
||||
|
||||
sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10
|
||||
sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer*; #Fix builds with GCC 10
|
||||
rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;
|
||||
#
|
||||
#END OF DEVICE CHANGES
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ buildAll() {
|
|||
buildDevice bacon;
|
||||
buildDevice d852;
|
||||
buildDevice d855;
|
||||
buildDevice klte; #unb18
|
||||
buildDevice klte;
|
||||
#buildDevice m8; #unb18
|
||||
buildDevice victara; #error: +out/target/product/victara/recovery.img too large (10522624 >= 10485760)
|
||||
#SD805
|
||||
|
|
@ -78,8 +78,8 @@ buildAll() {
|
|||
buildDevice oneplus3 verity; #broken yyloc
|
||||
#SD835
|
||||
buildDevice cheryl verity;
|
||||
#buildDevice cheeseburger verity; #needs manual patching - vendor common makefile
|
||||
#buildDevice dumpling verity;
|
||||
buildDevice cheeseburger verity; #needs manual patching - vendor common makefile
|
||||
buildDevice dumpling verity;
|
||||
buildDevice mata verity;
|
||||
buildDevice taimen avb;
|
||||
buildDevice walleye avb;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BAS
|
|||
cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/divested/"; #Add our vendor files
|
||||
|
||||
enterAndClear "bootable/recovery";
|
||||
#git revert --no-edit 304cbe612ccd85ef376a3fb4f7166961dc1d1afc; #Don't allow bypassing signature verification
|
||||
patch -p1 < "$DOS_PATCHES/android_bootable_recovery/0001-No_SerialNum_Restrictions.patch"; #Abort on serial number specific packages (GrapheneOS)
|
||||
|
||||
enterAndClear "build/make";
|
||||
|
|
@ -66,7 +65,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa
|
|||
echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
|
||||
|
||||
enterAndClear "external/chromium-webview";
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/88/305088/3; #update webview
|
||||
git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/57/308057/1; #update webview
|
||||
|
||||
enterAndClear "frameworks/base";
|
||||
hardenLocationConf services/core/java/com/android/server/location/gps_debug.conf;
|
||||
|
|
@ -252,9 +251,6 @@ echo "type sensors_data_file, file_type, data_file_type, core_data_file_type;" >
|
|||
#enterAndClear "device/moto/shamu";
|
||||
#git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO
|
||||
|
||||
#enterAndClear "device/motorola/clark";
|
||||
#echo "TARGET_RECOVERY_PERMISSIVE_OVERRIDE := true" >> BoardConfig.mk; #Allow extract_firmware.sh to function
|
||||
|
||||
enterAndClear "device/oneplus/msm8998-common";
|
||||
awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation
|
||||
awk -i inplace '!/hal_camera_default, sensors_dbg_prop/' sepolicy/vendor/hal_camera_default.te; #Remove a neverallow
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ export DOS_GPS_SUPL_HOST="supl.google.com"; #Options: supl.{google,vodafone,sony
|
|||
#Release Processing
|
||||
export DOS_MALWARE_SCAN_BEFORE_SIGN=false; #Scan device files for malware before signing
|
||||
export DOS_GENERATE_DELTAS=true; #Creates deltas from existing target_files in $DOS_BUILDS
|
||||
export DOS_GENERATE_DELTAS_DEVICES=('Amber' 'avicii' 'blueline' 'bonito' 'cheryl' 'coral' 'crosshatch' 'enchilada' 'fajita' 'flame' 'FP3' 'guacamole' 'guacamoleb' 'marlin' 'mata' 'pro1' 'sailfish' 'sargo' 'taimen' 'walleye'); #List of devices deltas will be generated for
|
||||
export DOS_AUTO_ARCHIVE_BUILDS=true; #Copies files to $DOS_BUILDS after signing
|
||||
export DOS_REMOVE_AFTER=true; #Removes device OUT directory after complete to reclaim space. Requires AUTO_ARCHIVE_BUILDS=true
|
||||
export DOS_GPG_SIGNING=true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue