11.0: Build fixes

This commit is contained in:
Tad 2018-12-18 20:39:06 -05:00
parent 314701f0e8
commit de1d7cf5ed
4 changed files with 9 additions and 5 deletions

6
.gitmodules vendored
View File

@ -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

@ -1 +1 @@
Subproject commit b7e4620a00d7b7cca5bc87f8d2e104977fe7c894
Subproject commit 8cccc645af2911c40643ebd38f720faaae16f52a

View File

@ -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

View File

@ -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