From 50d41ce3d8122bf4c4085a8c2386721b87a9d4f6 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 23 Jan 2017 03:59:03 -0500 Subject: [PATCH] Remove addonsu, update cherry picks --- Scripts/LAOS-14.1_Patches.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh index 2d39afc9..ae53a7a3 100644 --- a/Scripts/LAOS-14.1_Patches.sh +++ b/Scripts/LAOS-14.1_Patches.sh @@ -9,10 +9,7 @@ #rm -rf build vendor/cm device/motorola/clark device/oneplus/bacon device/lge/mako kernel/lge/mako kernel/oneplus/msm8974 kernel/motorola/msm8992 packages/apps/Settings frameworks/base build system/core external/sqlite packages/apps/Nfc packages/apps/Settings packages/apps/FDroid packages/apps/FDroidPrivilegedExtension packages/apps/GmsCore packages/apps/GsfProxy packages/apps/FakeStore kernel/lge/hammerhead kernel/moto/shamu bootable/recovery packages/apps/CMParts packages/apps/SetupWizard #Start a build -#repo sync -j24 --force-sync && sh ../../Scripts/LAOS-14.1_Patches.sh && source device/motorola/clark/setup-makefiles.sh && source build/envsetup.sh && export ANDROID_HOME="/home/tad/Android/SDK" && export JACK_SERVER_VM_ARGUMENTS="-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Xmx4096m" && brunch clark && make addonsu && brunch mako && make addonsu && export OTA_PACKAGE_SIGNING_KEY=../../Signing_Keys/releasekey && export SIGNING_KEY_DIR=../../Signing_Keys && brunch bacon && make addonsu && brunch thor && make addonsu - -#Build in su -#export WITH_SU=true +#repo sync -j24 --force-sync && sh ../../Scripts/LAOS-14.1_Patches.sh && source device/motorola/clark/setup-makefiles.sh && source build/envsetup.sh && export WITH_SU=true && export ANDROID_HOME="/home/tad/Android/SDK" && export JACK_SERVER_VM_ARGUMENTS="-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Xmx4096m" && brunch clark && brunch mako && export OTA_PACKAGE_SIGNING_KEY=../../Signing_Keys/releasekey && export SIGNING_KEY_DIR=../../Signing_Keys && brunch bacon && brunch thor # #START OF PREPRATION @@ -101,14 +98,13 @@ git fetch https://review.lineageos.org/LineageOS/cm_platform_sdk refs/changes/21 enter "vendor/cm" git fetch https://review.lineageos.org/LineageOS/android_vendor_cm refs/changes/01/156601/8 && git cherry-pick FETCH_HEAD #CustomTiles -git fetch https://review.lineageos.org/LineageOS/android_vendor_cm refs/changes/24/157524/5 && git cherry-pick FETCH_HEAD #Addon SU 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 enter "packages/apps/CMParts" -git fetch https://review.lineageos.org/LineageOS/android_packages_apps_CMParts refs/changes/15/113415/9 && git cherry-pick FETCH_HEAD #Network Traffic +git fetch https://review.lineageos.org/LineageOS/android_packages_apps_CMParts refs/changes/15/113415/11 && git cherry-pick FETCH_HEAD #Network Traffic patch -p1 < $patches"android_packages_apps_CMParts/0001-Remove_Analytics.patch" #Remove analytics enter "packages/apps/SetupWizard"