Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-25 07:29:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate updater patches

Browse Source
This commit is contained in:
Tad 2018-06-27 08:43:12 -04:00
parent e65234f8eb
commit 746b695d6a
5 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Patches/LineageOS-14.1/android_packages_apps_Updater/0001-Server.patch → Patches/Common/android_packages_apps_Updater/0001-Server.patch
View File

35
Patches/LineageOS-15.1/android_packages_apps_Updater/0001-Server.patch
View File

@ -1,35 +0,0 @@
From 4727712ba79e02a706735e0f01e094a0e4a8deb2 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Fri, 6 Apr 2018 14:14:03 -0400
Subject: [PATCH] Switch to our update server
Change-Id: Ief2f6ae8952de1a5a8e3ca73989fab42ca22f622
---
src/org/lineageos/updater/misc/Utils.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/org/lineageos/updater/misc/Utils.java b/src/org/lineageos/updater/misc/Utils.java
index 67895da..d4d3379 100644
--- a/src/org/lineageos/updater/misc/Utils.java
+++ b/src/org/lineageos/updater/misc/Utils.java
@@ -147,16 +147,8 @@ public class Utils {
String incrementalVersion = SystemProperties.get(Constants.PROP_BUILD_VERSION_INCREMENTAL);
String device = SystemProperties.get(Constants.PROP_NEXT_DEVICE,
SystemProperties.get(Constants.PROP_DEVICE));
- String type = SystemProperties.get(Constants.PROP_RELEASE_TYPE).toLowerCase(Locale.ROOT);
- String serverUrl = SystemProperties.get(Constants.PROP_UPDATER_URI);
- if (serverUrl.trim().isEmpty()) {
- serverUrl = context.getString(R.string.updater_server_url);
- }
-
- return serverUrl.replace("{device}", device)
- .replace("{type}", type)
- .replace("{incr}", incrementalVersion);
+ return "0OTASERVER0?base=LineageOS&device=" + device + "&inc=" + incrementalVersion;
}
public static String getChangelogURL(Context context) {
--
2.18.0

2
Scripts/LineageOS-14.1/Patch.sh
View File

@ -156,7 +156,7 @@ enterAndClear "packages/apps/Trebuchet";
cp -r "$patchesCommon/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; cp -r "$patchesCommon/android_packages_apps_Trebuchet/default_workspace/." "res/xml/";
enterAndClear "packages/apps/Updater"; enterAndClear "packages/apps/Updater";
patch -p1 < "$patches/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server patch -p1 < "$patchesCommon/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server
#TODO: Remove changelog #TODO: Remove changelog
enterAndClear "packages/apps/WallpaperPicker"; enterAndClear "packages/apps/WallpaperPicker";

2
Scripts/LineageOS-15.1/Functions.sh
View File

@ -62,7 +62,7 @@ buildAll() {
brunch lineage_flounder-user; brunch lineage_flounder-user;
brunch lineage_griffin-user; brunch lineage_griffin-user;
brunch lineage_h850-userdebug; brunch lineage_h850-userdebug;
brunch lineage_hammerhead-user; #broken upstream - fatal error: 'linux/msm_audio_calibration.h' file not found brunch lineage_hammerhead-user;
brunch lineage_klte-user; brunch lineage_klte-user;
brunch lineage_marlin-user; brunch lineage_marlin-user;
brunch lineage_m8-user; brunch lineage_m8-user;

2
Scripts/LineageOS-15.1/Patch.sh
View File

@ -162,7 +162,7 @@ enterAndClear "packages/apps/Trebuchet";
cp -r "$patchesCommon/android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; cp -r "$patchesCommon/android_packages_apps_Trebuchet/default_workspace/." "res/xml/";
enterAndClear "packages/apps/Updater"; enterAndClear "packages/apps/Updater";
patch -p1 < "$patches/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server patch -p1 < "$patchesCommon/android_packages_apps_Updater/0001-Server.patch"; #Switch to our server
#TODO: Remove changelog #TODO: Remove changelog
enterAndClear "packages/apps/WallpaperPicker"; enterAndClear "packages/apps/WallpaperPicker";