mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-06-18 11:39:24 -04:00
Churn
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
fb7bf503b1
commit
3231979ef4
6 changed files with 13 additions and 9 deletions
|
@ -25,7 +25,7 @@ Change-Id: I8a762d0f29ac42fce3dcfc7189e8ff216a8f8d1a
|
||||||
create mode 100644 src/com/android/settings/network/ConnectivityCheckPreferenceController.java
|
create mode 100644 src/com/android/settings/network/ConnectivityCheckPreferenceController.java
|
||||||
|
|
||||||
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
|
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
|
||||||
index cfc7671652..43affddf47 100644
|
index cfc7671652..fda8ff7f8c 100644
|
||||||
--- a/res/values/arrays.xml
|
--- a/res/values/arrays.xml
|
||||||
+++ b/res/values/arrays.xml
|
+++ b/res/values/arrays.xml
|
||||||
@@ -210,6 +210,36 @@
|
@@ -210,6 +210,36 @@
|
||||||
|
|
|
@ -80,9 +80,8 @@ patchWorkspace() {
|
||||||
verifyAllPlatformTags;
|
verifyAllPlatformTags;
|
||||||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||||
|
|
||||||
source build/envsetup.sh;
|
#source build/envsetup.sh;
|
||||||
#repopick -it ten-firewall;
|
#repopick -it ten-firewall;
|
||||||
repopick -it Q_tzdb2022g;
|
|
||||||
|
|
||||||
sh "$DOS_SCRIPTS/Patch.sh";
|
sh "$DOS_SCRIPTS/Patch.sh";
|
||||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||||
|
|
|
@ -109,11 +109,10 @@ patchWorkspace() {
|
||||||
verifyAllPlatformTags;
|
verifyAllPlatformTags;
|
||||||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||||
|
|
||||||
source build/envsetup.sh;
|
#source build/envsetup.sh;
|
||||||
#repopick -it eleven-firewall;
|
#repopick -it eleven-firewall;
|
||||||
#repopick -i 314453; #TaskViewTouchController: Null check current animation on drag
|
#repopick -i 314453; #TaskViewTouchController: Null check current animation on drag
|
||||||
#repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default
|
#repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default
|
||||||
repopick -it R_tzdb2022g;
|
|
||||||
|
|
||||||
sh "$DOS_SCRIPTS/Patch.sh";
|
sh "$DOS_SCRIPTS/Patch.sh";
|
||||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||||
|
|
|
@ -74,10 +74,9 @@ patchWorkspace() {
|
||||||
verifyAllPlatformTags;
|
verifyAllPlatformTags;
|
||||||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||||
|
|
||||||
source build/envsetup.sh;
|
#source build/envsetup.sh;
|
||||||
#repopick -ift twelve-bt-sbc-hd-dualchannel;
|
#repopick -ift twelve-bt-sbc-hd-dualchannel;
|
||||||
#repopick -it twelve-colors;
|
#repopick -it twelve-colors;
|
||||||
repopick -it S_tzdb2022g;
|
|
||||||
|
|
||||||
sh "$DOS_SCRIPTS/Patch.sh";
|
sh "$DOS_SCRIPTS/Patch.sh";
|
||||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||||
|
|
|
@ -107,8 +107,7 @@ patchWorkspace() {
|
||||||
verifyAllPlatformTags;
|
verifyAllPlatformTags;
|
||||||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||||
|
|
||||||
source build/envsetup.sh;
|
#source build/envsetup.sh;
|
||||||
repopick -it T_tzdb2022g;
|
|
||||||
|
|
||||||
sh "$DOS_SCRIPTS/Patch.sh";
|
sh "$DOS_SCRIPTS/Patch.sh";
|
||||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||||
|
|
|
@ -428,6 +428,14 @@ if enterAndClear "device/google/redbull"; then
|
||||||
if [ "$DOS_DEFCONFIG_DISABLER" = true ]; then awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; fi; #fix compile after hardenDefconfig
|
if [ "$DOS_DEFCONFIG_DISABLER" = true ]; then awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; fi; #fix compile after hardenDefconfig
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
|
if enterAndClear "kernel/google/muskie"; then
|
||||||
|
git revert --no-edit 19c8b61e1ae4b6598f5b6a4d328f4f6b7cd11244; #compile fix: out of space
|
||||||
|
fi;
|
||||||
|
|
||||||
|
if enterAndClear "kernel/google/taimen"; then
|
||||||
|
git revert --no-edit 0ba4518422b3c398590a3ffea77f3e65eaebe309; #compile fix: out of space
|
||||||
|
fi;
|
||||||
|
|
||||||
if enterAndClear "kernel/google/wahoo"; then
|
if enterAndClear "kernel/google/wahoo"; then
|
||||||
sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO
|
sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO
|
||||||
fi;
|
fi;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue