17.1: add surnia + other changes

- 17.1: fixup invalid line in marlin from deblobber
- 18.1: fixup audiofx removal
- all: change repo sync to 8 threads from 20, for google HTTP 429 error

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2021-08-26 21:02:28 -04:00
parent 792cb89ed7
commit 043b194210
9 changed files with 13 additions and 7 deletions

View File

@ -101,6 +101,9 @@
<project path="device/motorola/osprey" name="LineageOS/android_device_motorola_osprey" remote="github" />
<project path="kernel/motorola/msm8916" name="LineageOS/android_kernel_motorola_msm8916" remote="github" />
<!-- Moto E 2015 LTE (surnia) -->
<project path="device/motorola/surnia" name="LineageOS/android_device_motorola_surnia" remote="github" />
<!-- Moto X Pure Edition (clark) -->
<project path="device/motorola/clark" name="LineageOS/android_device_motorola_clark" remote="github" />
<project path="kernel/motorola/msm8992" name="LineageOS/android_kernel_motorola_msm8992" remote="github" />

View File

@ -24,7 +24,7 @@ export -f patchAllKernels;
resetWorkspace() {
umask 0022;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j20 --force-sync;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j8 --force-sync;
}
export -f resetWorkspace;

View File

@ -24,7 +24,7 @@ export -f patchAllKernels;
resetWorkspace() {
umask 0022;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j20 --force-sync;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j8 --force-sync;
}
export -f resetWorkspace;

View File

@ -24,7 +24,7 @@ export -f patchAllKernels;
resetWorkspace() {
umask 0022;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j20 --force-sync;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j8 --force-sync;
}
export -f resetWorkspace;

View File

@ -24,7 +24,7 @@ export -f patchAllKernels;
resetWorkspace() {
umask 0022;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j20 --force-sync;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j8 --force-sync;
}
export -f resetWorkspace;

View File

@ -24,7 +24,7 @@ export -f patchAllKernels;
resetWorkspace() {
umask 0022;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j20 --force-sync;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j8 --force-sync;
}
export -f resetWorkspace;
@ -57,6 +57,7 @@ buildAll() {
#SD410
buildDevice crackling;
buildDevice osprey;
buildDevice surnia;
#SD801
buildDevice m8; #18.1 has issues?
#SD808

View File

@ -287,6 +287,7 @@ fi;
if enterAndClear "device/google/marlin"; then
git revert --no-edit 777dafa35f185b1f501e3c80b8ab495191583444; #remove some carrier blobs
sed -i 's/BTLogSave \\/BTLogSave/' common/base.mk; #deblobber fixup
fi;
if enterAndClear "device/htc/m8-common"; then
@ -353,6 +354,7 @@ removeBuildFingerprints;
#Tweaks for <2GB RAM devices
#enableLowRam "device/motorola/osprey";
#enableLowRam "device/motorola/surnia";
#Fix broken options enabled by hardenDefconfig()
sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/yellowstone/arch/arm*/configs/*_defconfig; #Breaks on compile

View File

@ -24,7 +24,7 @@ export -f patchAllKernels;
resetWorkspace() {
umask 0022;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j20 --force-sync;
repo forall -c 'git add -A && git reset --hard' && rm -rf out && repo sync -j8 --force-sync;
}
export -f resetWorkspace;

View File

@ -252,7 +252,7 @@ awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/*.mk; #Remove Lineage ext
awk -i inplace '!/security\/lineage/' config/*.mk; #Remove Lineage extra keys
awk -i inplace '!/WeatherProvider/' config/*.mk; #Remove Weather
awk -i inplace '!/def_backup_transport/' overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml; #Unset default backup provider
if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/AudioFX/' config/*.mk; fi; #Remove AudioFX #XXX: 18REBASE
if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then sed -i '25d' config/common_mobile.mk && awk -i inplace '!/AudioFX/' config/*.mk; fi; #Remove AudioFX #XXX: 18REBASE
if [ "$DOS_MICROG_INCLUDED" = "NLP" ]; then sed -i '/Google provider/!b;n;s/com.google.android.gms/org.microg.nlp/' overlay/common/frameworks/base/core/res/res/values/config.xml; fi; #Adjust the fused providers
sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/*.mk; #Change buildtype
if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYPE := dos/LINEAGE_BUILDTYPE := dosNC/' config/*.mk; fi;