From 08d5fb0d2bfd8da7b8ec4eb7024a1bf8c43b46eb Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 13 Jul 2017 23:46:31 -0400 Subject: [PATCH] Fixes and tweaks --- Scripts/Generate_Incrementals.sh | 3 +++ Scripts/Generic_Deblob.sh | 3 ++- Scripts/LAOS-14.1_Patches.sh | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Scripts/Generate_Incrementals.sh diff --git a/Scripts/Generate_Incrementals.sh b/Scripts/Generate_Incrementals.sh new file mode 100644 index 00000000..7e3c899f --- /dev/null +++ b/Scripts/Generate_Incrementals.sh @@ -0,0 +1,3 @@ +base="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/" +builds="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/out/target/product/" +incrementals="/mnt/Drive-1/Development/Other/Android_ROMs/Builds/LineageOS-14.1/user_release-keys/incremental" diff --git a/Scripts/Generic_Deblob.sh b/Scripts/Generic_Deblob.sh index 1d450ff9..906a7257 100755 --- a/Scripts/Generic_Deblob.sh +++ b/Scripts/Generic_Deblob.sh @@ -8,7 +8,8 @@ # #Device Status (Tested under LineageOS 14.1) # -#Functioning as Expected: bacon, clark, mako, thor +#Functioning as Expected: bacon, clark, mako, marlin, sailfish, thor +#Broken: shamu base="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/"; export base; diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh index 03b3c90c..69ff7c47 100755 --- a/Scripts/LAOS-14.1_Patches.sh +++ b/Scripts/LAOS-14.1_Patches.sh @@ -10,6 +10,9 @@ #Build! #brunch lineage_mako-user && export OTA_PACKAGE_SIGNING_KEY=../../Signing_Keys/releasekey && export SIGNING_KEY_DIR=../../Signing_Keys && brunch lineage_clark-user && brunch lineage_bacon-user && brunch lineage_thor-userdebug && brunch lineage_angler-user && brunch lineage_bullhead-user && brunch lineage_ether-user && brunch lineage_flounder-user && brunch lineage_flo-user && brunch lineage_hammerhead-user && brunch lineage_marlin-user && brunch lineage_sailfish-user && brunch lineage_n5110-user && brunch lineage_osprey-user && brunch lineage_shamu-user && brunch lineage_Z00T-user +#Generate an incremental +#./build/tools/releasetools/ota_from_target_files --block -t 8 -i old.zip new.zip update.zip + # #START OF PREPRATION # @@ -111,7 +114,6 @@ sed -i 's/FLP_DEFAULT = FLP_GOOGLE;/FLP_DEFAULT = FLP_OPENSTREETMAP;/' src/com/a sed -i 's/CMSettings.System.ENABLE_FORWARD_LOOKUP, 1)/CMSettings.System.ENABLE_FORWARD_LOOKUP, 0)/' src/com/android/dialer/lookup/LookupSettings.java; #Disable FLP by default sed -i 's/CMSettings.System.ENABLE_PEOPLE_LOOKUP, 1)/CMSettings.System.ENABLE_PEOPLE_LOOKUP, 0)/' src/com/android/dialer/lookup/LookupSettings.java; #Disable PLP by default sed -i 's/CMSettings.System.ENABLE_REVERSE_LOOKUP, 1)/CMSettings.System.ENABLE_REVERSE_LOOKUP, 0)/' src/com/android/dialer/lookup/LookupSettings.java; #Disable RLP by default -git fetch https://review.lineageos.org/LineageOS/android_packages_apps_Dialer refs/changes/76/180776/1 && git cherry-pick FETCH_HEAD #remove non-https providers enter "packages/apps/FakeStore" sed -i 's|$(OUT_DIR)/target/|$(PWD)/$(OUT_DIR)/target/|' Android.mk; @@ -121,6 +123,7 @@ sed -i 's/ext.androidBuildVersionTools = "24.0.3"/ext.androidBuildVersionTools = enter "packages/apps/FDroid" patch -p1 < $patches"android_packages_apps_FDroid/0001.patch" #Enable privigled module patch -p1 < $patches"android_packages_apps_FDroid/0002-Repos.patch" #Add IzzySoft, microG, and Eutopia repos +sed -i 's|cd $(fdroid_root)/$(fdroid_dir) && gradle assembleRelease|cd $(fdroid_root) && ./gradlew assembleRelease|' Android.mk; #Gradle 4.0 fix enter "packages/apps/FDroidPrivilegedExtension" patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch" #Change to release key @@ -170,6 +173,7 @@ cp $patches"android_vendor_cm/sce.mk" config/sce.mk cp $patches"android_vendor_cm/config.xml" overlay/common/vendor/cmsdk/cm/res/res/values/config.xml; #Per app performance profiles sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence +sed -i 's/mka bacon/mka bacon target-files-package dist/' build/envsetup.sh; #Create target-files for incrementals enter "vendor/cmsdk" git fetch https://review.lineageos.org/LineageOS/cm_platform_sdk refs/changes/21/148321/14 && git cherry-pick FETCH_HEAD #network traffic