From 8051efe8e086813ab4de430833793c40b4303554 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 11:31:55 +0100 Subject: [PATCH 1/9] 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 000000000..59252771c --- /dev/null +++ b/overlay/microg/frameworks/base/core/res/res/values/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + true + + -- GitLab From ebf9a0ce4e1a22e0653509490648fd6002d0d23e Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 16:36:11 +0100 Subject: [PATCH 2/9] 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 fcd748dce..8a2d2b1de 100644 --- a/config/common.mk +++ b/config/common.mk @@ -263,11 +263,6 @@ ifndef LINEAGE_BUILDTYPE endif endif -# Filter out random types, so it'll reset to UNOFFICIAL -ifeq ($(filter RELEASE NIGHTLY SNAPSHOT EXPERIMENTAL,$(LINEAGE_BUILDTYPE)),) - LINEAGE_BUILDTYPE := -endif - ifdef LINEAGE_BUILDTYPE ifneq ($(LINEAGE_BUILDTYPE), SNAPSHOT) ifdef LINEAGE_EXTRAVERSION -- GitLab From c9cba20ef8403b73abf94e4b84fc23916d31cfed Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 16:51:11 +0100 Subject: [PATCH 3/9] Set up microG overlay --- config/common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/common.mk b/config/common.mk index 8a2d2b1de..a0aa779da 100644 --- a/config/common.mk +++ b/config/common.mk @@ -241,6 +241,8 @@ PRODUCT_PACKAGES += \ endif endif +PRODUCT_PACKAGE_OVERLAYS := vendor/lineage/overlay/microg + DEVICE_PACKAGE_OVERLAYS += vendor/lineage/overlay/common PRODUCT_VERSION_MAJOR = 0 -- GitLab From a88aab6cd953e0bb573121d20b4c7d82fae0b301 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 17:23:17 +0100 Subject: [PATCH 4/9] Setup /e/ packages --- config/common.mk | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/config/common.mk b/config/common.mk index a0aa779da..f65af30ae 100644 --- a/config/common.mk +++ b/config/common.mk @@ -121,6 +121,35 @@ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true 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 Lineage packages PRODUCT_PACKAGES += \ LineageParts \ -- GitLab From ac7a584d6d01e16e7681a16cb4adf84df0e486fb Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 17:23:40 +0100 Subject: [PATCH 5/9] Setup /e/ packages --- config/common.mk | 55 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/config/common.mk b/config/common.mk index f65af30ae..fe734abb3 100644 --- a/config/common.mk +++ b/config/common.mk @@ -121,34 +121,33 @@ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := true 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 /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 Lineage packages PRODUCT_PACKAGES += \ -- GitLab From 668143cbceb070eb57c3d6522d7464c07b91449b Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 17:24:27 +0100 Subject: [PATCH 6/9] Setup custom packages --- config/common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/common.mk b/config/common.mk index fe734abb3..629522cda 100644 --- a/config/common.mk +++ b/config/common.mk @@ -211,6 +211,11 @@ PRODUCT_PACKAGES += \ wget \ zip +# Custom packages +ifdef CUSTOM_PACKAGES +PRODUCT_PACKAGES += $(CUSTOM_PACKAGES) +endif + # Charger PRODUCT_PACKAGES += \ charger_res_images -- GitLab From 764a079476548f1b75ea05af983be28387dc469a Mon Sep 17 00:00:00 2001 From: Tom Powell Date: Wed, 26 Feb 2020 04:45:43 +0000 Subject: [PATCH 7/9] 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 (cherry picked from commit f8adf067fddcb617e1c491caa3938c1329c526fb) --- build/core/mtk_utils.mk | 0 build/tools/roomservice.py | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) mode change 100755 => 100644 build/core/mtk_utils.mk diff --git a/build/core/mtk_utils.mk b/build/core/mtk_utils.mk old mode 100755 new mode 100644 diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py index 813d0b77d..bf502a531 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 5ec216ce49b9c9966b1d8e7cb42c96ff1338d3e2 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 23 Mar 2020 16:47:13 +0000 Subject: [PATCH 8/9] 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 629522cda..ba76aa1ba 100644 --- a/config/common.mk +++ b/config/common.mk @@ -124,30 +124,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 Lineage packages PRODUCT_PACKAGES += \ -- GitLab From 00689281cccd35aa02b6343ca8cd604a599ccb95 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 6 Apr 2020 16:59:53 +0200 Subject: [PATCH 9/9] Revert "Add ecloud SMS support" This reverts commit 5ec216ce49b9c9966b1d8e7cb42c96ff1338d3e2. --- config/common.mk | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/config/common.mk b/config/common.mk index ba76aa1ba..629522cda 100644 --- a/config/common.mk +++ b/config/common.mk @@ -124,31 +124,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 Lineage packages PRODUCT_PACKAGES += \ -- GitLab