From add01769cd15096e2b045d8df35978f8dd2ca355 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 11:28:38 +0100 Subject: [PATCH 1/8] Override device-specific settings for the location providers Based on https://github.com/lineageos4microg/docker-lineage-cicd/blob/master/src/signature_spoofing_patches/frameworks_base_config.xml --- .../base/core/res/res/values/config.xml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 overlay/microg/frameworks/base/core/res/res/values/config.xml diff --git a/overlay/microg/frameworks/base/core/res/res/values/config.xml b/overlay/microg/frameworks/base/core/res/res/values/config.xml new file mode 100644 index 00000000..59252771 --- /dev/null +++ b/overlay/microg/frameworks/base/core/res/res/values/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + true + + -- GitLab From 69418d725baf3023ac158910b522c6a47ee60563 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 16:36:42 +0100 Subject: [PATCH 2/8] Remove filter out random types behavior --- config/common.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/common.mk b/config/common.mk index f8dff492..b2b45937 100644 --- a/config/common.mk +++ b/config/common.mk @@ -252,11 +252,6 @@ ifndef CM_BUILDTYPE endif endif -# Filter out random types, so it'll reset to UNOFFICIAL -ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(CM_BUILDTYPE)),) - CM_BUILDTYPE := -endif - ifdef CM_BUILDTYPE ifneq ($(CM_BUILDTYPE), SNAPSHOT) ifdef CM_EXTRAVERSION -- GitLab From 67d72b69c0f4a1cac9584865255fcbac516ceea7 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 16:52:07 +0100 Subject: [PATCH 3/8] Set up microG overlay --- config/common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/common.mk b/config/common.mk index b2b45937..bc7de3ff 100644 --- a/config/common.mk +++ b/config/common.mk @@ -226,6 +226,8 @@ PRODUCT_PACKAGES += \ endif endif +PRODUCT_PACKAGE_OVERLAYS := vendor/cm/overlay/microg + DEVICE_PACKAGE_OVERLAYS += vendor/cm/overlay/common PRODUCT_VERSION_MAJOR = 0 -- GitLab From c64ecf4af35f957a6e0fec7283faba055526c109 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 17:20:14 +0100 Subject: [PATCH 4/8] Setup /e/ packages --- config/common.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/config/common.mk b/config/common.mk index bc7de3ff..971eb85f 100644 --- a/config/common.mk +++ b/config/common.mk @@ -94,6 +94,34 @@ endif PRODUCT_PACKAGES += \ bootanimation.zip +# Required /e/ packages +PRODUCT_PACKAGES += \ + GmsCore \ + GsfProxy \ + FakeStore \ + com.google.android.maps.jar \ + Mail \ + BlissLauncher \ + BlissIconPack \ + MozillaNlpBackend \ + OpenWeatherMapWeatherProvider \ + AccountManager \ + MagicEarth \ + PdfViewer \ + Camera \ + eDrive \ + Weather \ + Notes \ + Tasks \ + NominatimNlpBackend \ + DroidGuard \ + LibreOfficeViewer \ + OpenKeychain \ + Message \ + Browser \ + BrowserWebView \ + Apps + # Required CM packages PRODUCT_PACKAGES += \ BluetoothExt \ -- GitLab From eb25bfca0925dc78eb1cc4d42d9a477eeb3d4ff4 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 17:20:29 +0100 Subject: [PATCH 5/8] Setup custom packages --- config/common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/common.mk b/config/common.mk index 971eb85f..a93d3b4c 100644 --- a/config/common.mk +++ b/config/common.mk @@ -187,6 +187,11 @@ PRODUCT_PACKAGES += \ wget \ zip +# Custom packages +ifdef CUSTOM_PACKAGES +PRODUCT_PACKAGES += $(CUSTOM_PACKAGES) +endif + # Custom off-mode charger ifneq ($(WITH_CM_CHARGER),false) PRODUCT_PACKAGES += \ -- GitLab From afd6ff248330c41429a92629f6341c4327b3eb94 Mon Sep 17 00:00:00 2001 From: Tom Powell Date: Wed, 26 Feb 2020 04:45:43 +0000 Subject: [PATCH 6/8] roomservice: support new manifest formats. .repo/manifest.xml is no longer a symlink becuase apparently windows developers need to use repo and windows needs admin for symlinks. https: //gerrit.googlesource.com/git-repo/+/a269b1cb9dc21dfd598bfea3766206b606ad4589 Change-Id: I88ea0295133959136d7214f13a76b66d89dc88d4 Signed-off-by: Romain Hunault (cherry picked from commit bb210840f5fb475102078cedada030a87fd0deaf) --- build/tools/roomservice.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py index 5020915e..75bd4c51 100755 --- a/build/tools/roomservice.py +++ b/build/tools/roomservice.py @@ -110,8 +110,21 @@ def indent(elem, level=0): if level and (not elem.tail or not elem.tail.strip()): elem.tail = i -def get_default_revision(): +def get_manifest_path(): + '''Find the current manifest path + In old versions of repo this is at .repo/manifest.xml + In new versions, .repo/manifest.xml includes an include + to some arbitrary file in .repo/manifests''' + m = ElementTree.parse(".repo/manifest.xml") + try: + m.findall('default')[0] + return '.repo/manifest.xml' + except IndexError: + return ".repo/manifests/{}".format(m.find("include").get("name")) + +def get_default_revision(): + m = ElementTree.parse(get_manifest_path()) d = m.findall('default')[0] r = d.get('revision') return r.replace('refs/heads/', '').replace('refs/tags/', '') @@ -142,7 +155,7 @@ def is_in_manifest(projectpath): # Search in main manifest, too try: - lm = ElementTree.parse(".repo/manifest.xml") + lm = ElementTree.parse(get_manifest_path()) lm = lm.getroot() except: lm = ElementTree.Element("manifest") -- GitLab From 19b63e6fa304275c008904fe11f38e455514c6d4 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 23 Mar 2020 16:47:31 +0000 Subject: [PATCH 7/8] Add ecloud SMS support --- config/common.mk | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/config/common.mk b/config/common.mk index a93d3b4c..7bba164e 100644 --- a/config/common.mk +++ b/config/common.mk @@ -97,30 +97,31 @@ PRODUCT_PACKAGES += \ # Required /e/ packages PRODUCT_PACKAGES += \ GmsCore \ - GsfProxy \ - FakeStore \ - com.google.android.maps.jar \ - Mail \ - BlissLauncher \ - BlissIconPack \ - MozillaNlpBackend \ - OpenWeatherMapWeatherProvider \ - AccountManager \ - MagicEarth \ - PdfViewer \ - Camera \ - eDrive \ - Weather \ - Notes \ - Tasks \ - NominatimNlpBackend \ - DroidGuard \ - LibreOfficeViewer \ - OpenKeychain \ - Message \ - Browser \ - BrowserWebView \ - Apps + GsfProxy \ + FakeStore \ + com.google.android.maps.jar \ + Mail \ + BlissLauncher \ + BlissIconPack \ + MozillaNlpBackend \ + OpenWeatherMapWeatherProvider \ + AccountManager \ + MagicEarth \ + PdfViewer \ + Camera \ + eDrive \ + Weather \ + Notes \ + Tasks \ + NominatimNlpBackend \ + DroidGuard \ + LibreOfficeViewer \ + OpenKeychain \ + Message \ + Browser \ + BrowserWebView \ + Apps \ + eSMS # Required CM packages PRODUCT_PACKAGES += \ -- GitLab From df49f1b2d463425eab1ed50123513b8f37b24b8c Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 6 Apr 2020 16:55:58 +0200 Subject: [PATCH 8/8] Revert "Add ecloud SMS support" This reverts commit 19b63e6fa304275c008904fe11f38e455514c6d4. --- config/common.mk | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/config/common.mk b/config/common.mk index 7bba164e..a93d3b4c 100644 --- a/config/common.mk +++ b/config/common.mk @@ -97,31 +97,30 @@ PRODUCT_PACKAGES += \ # Required /e/ packages PRODUCT_PACKAGES += \ GmsCore \ - GsfProxy \ - FakeStore \ - com.google.android.maps.jar \ - Mail \ - BlissLauncher \ - BlissIconPack \ - MozillaNlpBackend \ - OpenWeatherMapWeatherProvider \ - AccountManager \ - MagicEarth \ - PdfViewer \ - Camera \ - eDrive \ - Weather \ - Notes \ - Tasks \ - NominatimNlpBackend \ - DroidGuard \ - LibreOfficeViewer \ - OpenKeychain \ - Message \ - Browser \ - BrowserWebView \ - Apps \ - eSMS + GsfProxy \ + FakeStore \ + com.google.android.maps.jar \ + Mail \ + BlissLauncher \ + BlissIconPack \ + MozillaNlpBackend \ + OpenWeatherMapWeatherProvider \ + AccountManager \ + MagicEarth \ + PdfViewer \ + Camera \ + eDrive \ + Weather \ + Notes \ + Tasks \ + NominatimNlpBackend \ + DroidGuard \ + LibreOfficeViewer \ + OpenKeychain \ + Message \ + Browser \ + BrowserWebView \ + Apps # Required CM packages PRODUCT_PACKAGES += \ -- GitLab