Small tweaks

Fixes oneplus2 boot
https://github.com/Divested-Mobile/DivestOS-Build/issues/5
This commit is contained in:
Tad 2021-05-29 00:55:57 -04:00
parent dd938051a5
commit f89f0cb983
5 changed files with 6 additions and 8 deletions

View File

@ -125,6 +125,7 @@
<project path="kernel/oneplus/msm8994" name="LineageOS/android_kernel_oneplus_msm8994" remote="github" />
<!-- OnePlus 7 (guacamoleb) -->
<project path="device/oneplus/common" name="LineageOS/android_device_oneplus_common" remote="github" />
<project path="device/oneplus/sm8150-common" name="LineageOS/android_device_oneplus_sm8150-common" remote="github" />
<project path="device/oneplus/guacamoleb" name="LineageOS/android_device_oneplus_guacamoleb" remote="github" />
<project path="kernel/oneplus/sm8150" name="LineageOS/android_kernel_oneplus_sm8150" remote="github" />

@ -1 +1 @@
Subproject commit 24b2d044fa4986523ea65522ceb3bd7ca6368633
Subproject commit f9d5e818545c08d51e2d84f87ebcdaa394026e15

View File

@ -114,7 +114,7 @@ enableDexPreOpt() {
if [ -f BoardConfig.mk ]; then
echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk;
if true; then
if [ "$1" != "device/oneplus/oneplus2" ]; then
echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk;
echo "Enabled full dexpreopt for $1";
else

View File

@ -98,9 +98,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26147/^5.12/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch
editKernelLocalversion "-dos.p102"
editKernelLocalversion "-dos.p98"
cd "$DOS_BUILD_BASE"

View File

@ -103,7 +103,8 @@ export -f buildAll;
patchWorkspace() {
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
#source build/envsetup.sh;
source build/envsetup.sh;
repopick -i 310855; #mata 4.4.270
source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";