From 910ee5ad76619e067ae1eb2dc4861632cf1f1a7e Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 12 Feb 2018 05:28:24 -0500 Subject: [PATCH] 15.1: Build fixes --- .../android_vendor_lineage/0001-SCE.patch | 10 +++++----- Scripts/LineageOS-14.1/Functions.sh | 2 +- Scripts/LineageOS-14.1/Patch.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 5 ++++- Scripts/LineageOS-15.1/Patch.sh | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/0001-SCE.patch b/Patches/LineageOS-15.1/android_vendor_lineage/0001-SCE.patch index 496ea1ce..695b1d44 100644 --- a/Patches/LineageOS-15.1/android_vendor_lineage/0001-SCE.patch +++ b/Patches/LineageOS-15.1/android_vendor_lineage/0001-SCE.patch @@ -1,15 +1,15 @@ -From 67c7c88735d0f0d9cb6bc7c4478bdb6c171eb40a Mon Sep 17 00:00:00 2001 +From 7d1d784140abb4d77b5fcee84503460d2183aae9 Mon Sep 17 00:00:00 2001 From: Tad -Date: Mon, 12 Feb 2018 03:38:10 -0500 +Date: Mon, 12 Feb 2018 05:04:38 -0500 Subject: [PATCH] SC Extras -Change-Id: I257d33a176d3b7741b0c85932704bac76cc0271c +Change-Id: I24c048094f6fe8a6ca7bdb4931d9d41d9fc183bb --- config/common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/common.mk b/config/common.mk -index 10c6ec77..cfc5636a 100644 +index 10c6ec77..a0ebbd86 100644 --- a/config/common.mk +++ b/config/common.mk @@ -103,6 +103,9 @@ ifeq ($(WITH_TWRP),true) @@ -17,7 +17,7 @@ index 10c6ec77..cfc5636a 100644 endif +# SC Extras -+include vendor/cm/config/sce.mk ++include vendor/lineage/config/sce.mk + # Bootanimation PRODUCT_PACKAGES += \ diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index c8387272..a34d3a1a 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -86,7 +86,7 @@ buildAll() { } export -f buildAll; -buildAllN03() { +buildAllNO3() { brunch lineage_flo-user; #Not affected by size, but breaks: undefined reference to 'mm_jpeg_get_new_session_idx' #Devices incompatible with -O3 due to size constraints #TODO: Consider moving these devices back and simply disabling recovery.img compilation diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 1a81df8c..f627f7a8 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -64,7 +64,7 @@ patch -p1 < $patches"android_bootable_recovery/0001-Squash_Menus.patch"; #What's enterAndClear "build" patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing. Disclaimer: From CopperheadOS 13.0 -patch -p1 < $patches"android_build/JustArchis_Optimizations-Rebased.patch" #JustArchi's Compiler Flags XXX: Breaks some devices, see buildAllN03() +patch -p1 < $patches"android_build/JustArchis_Optimizations-Rebased.patch" #JustArchi's Compiler Flags XXX: Breaks some devices, see buildAllNO3() sed -i 's/messaging/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence enterAndClear "device/qcom/sepolicy" diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index e52ac6a5..5fe11e6c 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -59,15 +59,18 @@ buildAll() { #Select devices are userdebug due to SELinux policy issues #TODO: Add victara, griffin, athene, us997, us996, pme, t0lte, hlte brunch lineage_d852-userdebug; + brunch lineage_d855-userdebug; } export -f buildAll; -buildAllN03() { +buildAllNO3() { brunch lineage_flo-user; #Not affected by size, but breaks: undefined reference to 'mm_jpeg_get_new_session_idx' } export -f buildAllN03; patchWorkspace() { + source build/envsetup.sh; + repopick 204743 204744; source $scripts/Patch.sh; source $scripts/Defaults.sh; source $scripts/Overclock.sh; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index cc8c6625..4460f8fd 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -59,7 +59,7 @@ cp -r $patches"Fennec_DOS-Shim" $base"packages/apps/"; #Add a shim to install Fe enterAndClear "build/make" #patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing. Disclaimer: From CopperheadOS 13.0 TODO: Rebase -#patch -p1 < $patches"android_build/0002-JustArchis_Optimizations.patch" #JustArchi's Compiler Flags XXX: Breaks some devices, see buildAllN03() TODO: Rebase +#patch -p1 < $patches"android_build/0002-JustArchis_Optimizations.patch" #JustArchi's Compiler Flags XXX: Breaks some devices, see buildAllNO3() TODO: Rebase sed -i 's/messaging/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence enterAndClear "device/qcom/sepolicy"