From de1d7cf5ed32cdc99f46f8eee98c111f804e73c1 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 18 Dec 2018 20:39:06 -0500 Subject: [PATCH] 11.0: Build fixes --- .gitmodules | 6 +++--- PrebuiltApps | 2 +- .../CVE_Patchers/android_kernel_zte_msm8930.sh | 2 +- Scripts/LineageOS-11.0/Patch.sh | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 04f37bc4..789516f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "Patches/DivestOS_Wallpapers"] path = Patches/Wallpapers - url = ssh://git@10.0.1.5:2222/DivestOS/Wallpapers.git + url = personal-lan-git:tad/dos/Wallpapers.git [submodule "Patches/Linux"] path = Patches/Linux - url = ssh://git@10.0.1.5:2222/DivestOS/Linux_Patches.git + url = personal-lan-git:tad/dos/Linux_Patches.git [submodule "PrebuiltApps"] path = PrebuiltApps - url = ssh://git@10.0.1.5:2222/DivestOS/PrebuiltApps.git + url = personal-lan-git:tad/dos/PrebuiltApps.git diff --git a/PrebuiltApps b/PrebuiltApps index b7e4620a..8cccc645 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit b7e4620a00d7b7cca5bc87f8d2e104977fe7c894 +Subproject commit 8cccc645af2911c40643ebd38f720faaae16f52a diff --git a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh index afea155c..a249c7c3 100644 --- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh +++ b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh @@ -9,7 +9,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6703/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6703/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6704/^3.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-2015/^3.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0196/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-0196/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-1739/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-2523/^3.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/ANY/0002.patch diff --git a/Scripts/LineageOS-11.0/Patch.sh b/Scripts/LineageOS-11.0/Patch.sh index dddf3501..5c47c03c 100644 --- a/Scripts/LineageOS-11.0/Patch.sh +++ b/Scripts/LineageOS-11.0/Patch.sh @@ -62,6 +62,10 @@ gpgVerifyDirectory "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/packa cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE""vendor/fdroid_prebuilt/"; #Add the prebuilt apps cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/divested/"; #Add our vendor files +#fix prebuilts (disable dexopt and fix suffix) +sed -i 's/LOCAL_DEX_PREOPT := false/LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)/' packages/apps/Fennec_DOS-Shim/Android.mk; +sed -i 's/LOCAL_DEX_PREOPT := false/LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)/' vendor/fdroid_prebuilt/Android.mk; + enterAndClear "build"; #patch -p1 < "$DOS_PATCHES/android_build/0001-Automated_Build_Signing.patch"; #Automated build signing (CopperheadOS-13.0) #TODO sed -i 's/Mms/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence