From 7d99fa68e3e531e6b8f9447d5e6efc0cfb836b50 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 23 Dec 2016 20:01:47 -0500 Subject: [PATCH] Changes --- Changelogs/Changes-CM_14.1.txt | 4 ++-- .../0001-Fixes.patch | 20 ++++++++++--------- Scripts/CM-14.1_Patches.sh | 11 +++++----- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Changelogs/Changes-CM_14.1.txt b/Changelogs/Changes-CM_14.1.txt index 139b5915..145a31b9 100644 --- a/Changelogs/Changes-CM_14.1.txt +++ b/Changelogs/Changes-CM_14.1.txt @@ -1,4 +1,4 @@ -Last Updated: 12/20/2016 +Last Updated: 12/23/2016 General Changes - Added support for Chromium monochrome - Builds are dex-preopted on supported devices @@ -9,7 +9,7 @@ General Changes - Hardened IPv4 and IPv6 stacks - Hardened special file systems - Hardened SQLite - - Removed unnecessary/outdated/insecure packages + - Removed unnecessary/outdated/insecure packages. Warning: No Browser is included, please install getChromium or IceCat from F-Droid - Updated Chromium WebView on arm64 devices - F-Droid - F-Droid and FDroidPrivilegedExtension are included by default diff --git a/Patches/CyanogenMod-14.1/android_packages_apps_GsfProxy/0001-Fixes.patch b/Patches/CyanogenMod-14.1/android_packages_apps_GsfProxy/0001-Fixes.patch index 5e531d37..f183f457 100644 --- a/Patches/CyanogenMod-14.1/android_packages_apps_GsfProxy/0001-Fixes.patch +++ b/Patches/CyanogenMod-14.1/android_packages_apps_GsfProxy/0001-Fixes.patch @@ -1,13 +1,13 @@ -From a60baa9277642fe76672d5f05cce86f31c9a31e8 Mon Sep 17 00:00:00 2001 +From e81a668b7d57f230c4b2e924981d579d13d78ce4 Mon Sep 17 00:00:00 2001 From: Tad -Date: Sun, 18 Dec 2016 16:54:23 -0500 -Subject: [PATCH] Build fixes +Date: Fri, 23 Dec 2016 19:58:47 -0500 +Subject: [PATCH] Fix build tools -Change-Id: I81326811788ed53b420d5cd6c27dd26f3649ab2e +Change-Id: I7e30cb163233980e1faded4041791f5311a3ebda --- Android.mk | 4 ++-- - services-framework-proxy/build.gradle | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + services-framework-proxy/build.gradle | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Android.mk b/Android.mk index 50889ae..5193277 100644 @@ -31,14 +31,16 @@ index 50889ae..5193277 100644 cd $(gsfproxy_root) && git submodule update --recursive --init cd $(gsfproxy_root)/$(gsfproxy_dir) && JAVA_TOOL_OPTIONS="$(JAVA_TOOL_OPTIONS) -Dfile.encoding=UTF8" ../gradlew assembleRelease diff --git a/services-framework-proxy/build.gradle b/services-framework-proxy/build.gradle -index 6824f94..8d2556b 100644 +index 6824f94..7243816 100644 --- a/services-framework-proxy/build.gradle +++ b/services-framework-proxy/build.gradle -@@ -45,7 +45,7 @@ int getMyVersionCode() { +@@ -44,8 +44,8 @@ int getMyVersionCode() { + } android { - compileSdkVersion 23 +- compileSdkVersion 23 - buildToolsVersion "23.0.2" ++ compileSdkVersion 24 + buildToolsVersion "25.0.1" defaultConfig { diff --git a/Scripts/CM-14.1_Patches.sh b/Scripts/CM-14.1_Patches.sh index 2c07fcfe..46607487 100644 --- a/Scripts/CM-14.1_Patches.sh +++ b/Scripts/CM-14.1_Patches.sh @@ -1,6 +1,6 @@ #!/bin/bash -#TODO: Aggressive Doze (Verify Extended Doze First), App-based battery profiles, Change connectivity check URL, Optimized build flags, Optimized toolchain, OTA Updates, Ship Chromium, Update WebView for arm +#TODO: Aggressive Doze (Verify Extended Doze First), App-based battery profiles, Change connectivity check URL, Optimized build flags, Optimized toolchain, OTA Updates, Remove CMAnalytics, Ship Chromium, Update WebView for arm #Build UberTC #cd /home/tad/Android/Build/UBERTC/scripts && repo sync -j18 && ./arm-eabi-4.8 && ./arm-linux-androideabi-4.9 && ./aarch64-linux-android-4.9 @@ -80,20 +80,20 @@ enter "packages/apps/GmsCore" patch -p1 < $patches"android_packages_apps_GmsCore/0001-Fixes.patch" #Update output paths and build tools enter "packages/apps/GsfProxy" -patch -p1 < $patches"android_packages_apps_GsfProxy/0001-Fixes.patch" #Update output paths and build tools FIXME: Update SDK to 24 +patch -p1 < $patches"android_packages_apps_GsfProxy/0001-Fixes.patch" #Update output paths and build tools enter "packages/apps/FakeStore" patch -p1 < $patches"android_packages_apps_FakeStore/0001-Fixes.patch" #Update output paths and build tools enter "packages/apps/FDroid" patch -p1 < $patches"android_packages_apps_FDroid/0001.patch" #Enable privigled module -patch -p1 < $patches"android_packages_apps_FDroid/0002.patch" #Remove privigled module settings +#patch -p1 < $patches"android_packages_apps_FDroid/0002.patch" #Remove privigled module settings patch -p1 < $patches"android_packages_apps_FDroid/0003.patch" #Hide app updates for apps that are installed to /system patch -p1 < $patches"android_packages_apps_FDroid/0004.patch" #Update build tools #TODO: Create updated build tools patch rm app/src/main/res/xml/preferences.xml.orig -enter "packages/apps/FDroidPrivilegedExtension" #XXX: Janky af +enter "packages/apps/FDroidPrivilegedExtension" patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0001-Update_Build_Tools.patch" #Update build tools patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch" #Change to release key patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0003-Test_Keys.patch" #Add test-keys XXX: ONLY USE FOR TEST BUILDS @@ -101,6 +101,7 @@ patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0003-Test_K #test-keys: C8:A2:E9:BC:CF:59:7C:2F:B6:DC:66:BE:E2:93:FC:13:F2:FC:47:EC:77:BC:6B:2B:0D:52:C1:1F:51:19:2A:B8 enter "vendor/cm" +rm -rf gello #Gello is built out-of-tree and bundles Google Play Services library patch -p1 < $patches"android_vendor_cm/0001-SCE.patch" #Include our extras such as MicroG and F-Droid cp $patches"android_vendor_cm/sce.mk" config/sce.mk patch -p1 < $patches"android_vendor_cm/0002-Monochromium.patch" #Add Chromium webview support @@ -126,7 +127,7 @@ git revert e80d30e3968308cd2941b893608279220dfcf34f #don't add more sprint blobs patch -p1 < $patches"android_device_motorola_clark/0002-Remove_Sprint_DM.patch" #Removes Sprint Device Manager FIXME: Rebase patch -p1 < $patches"android_device_motorola_clark/0003-Enable_Dex_Preopt.patch" #Force enables dex pre-optimization patch -p1 < $patches"android_device_motorola_clark/0004-Remove_Widevine.patch" #Removes Google Widevine and disables the DRM server -patch -p1 < $patches"android_device_motorola_clark/0005-TWRP.patch" #Add TWRP support +#patch -p1 < $patches"android_device_motorola_clark/0005-TWRP.patch" #Add TWRP support enter "kernel/motorola/msm8992" patch -p1 < $patches"android_kernel_motorola_msm8992/0001-OverUnderClock.patch" #a57: 1.82Ghz -> 2.01Ghz, a53 1.44Ghz -> 1.63Ghz, 384Mhz -> 300Mhz =+1.14Ghz TODO: Enable by default