From 9fb6a5705b185f79a413b29a7d6fa9373ce7ebe9 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 11:33:10 +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 000000000..59252771c --- /dev/null +++ b/overlay/microg/frameworks/base/core/res/res/values/config.xml @@ -0,0 +1,25 @@ + + + + + + + true + true + + -- GitLab From 2788fb7d651ea63b2b319c749f84ab1f1d178c43 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 16:35:55 +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 bc75c8f26..7b9a7ca7e 100644 --- a/config/common.mk +++ b/config/common.mk @@ -274,11 +274,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 c35fa17f143d84ba352aa3a4784356806466012f Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 16:51:32 +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 7b9a7ca7e..5fc819337 100644 --- a/config/common.mk +++ b/config/common.mk @@ -251,6 +251,8 @@ PRODUCT_PACKAGES += \ endif endif +PRODUCT_PACKAGE_OVERLAYS := vendor/lineage/overlay/microg + PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/lineage/overlay DEVICE_PACKAGE_OVERLAYS += vendor/lineage/overlay/common -- GitLab From 7f9f6722a9a81a2f5992c098df7a6efc411f4e5a Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 17:22:04 +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 5fc819337..0cf9fc7c2 100644 --- a/config/common.mk +++ b/config/common.mk @@ -129,6 +129,34 @@ 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 ffa5dd42042dfae8ec8d0764b18d0311dc0f789c Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 24 Feb 2020 17:22:36 +0100 Subject: [PATCH 5/8] Setup custom packages --- config/common.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/common.mk b/config/common.mk index 0cf9fc7c2..641ed8b9f 100644 --- a/config/common.mk +++ b/config/common.mk @@ -221,6 +221,12 @@ PRODUCT_PACKAGES += \ wget \ zip +# Custom packages +ifdef CUSTOM_PACKAGES +PRODUCT_PACKAGES += $(CUSTOM_PACKAGES) +endif + + # Charger PRODUCT_PACKAGES += \ charger_res_images -- GitLab From 600b97b694e5bba8cb0f7da257bffe436c2c31c9 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 (cherry picked from commit f8adf067fddcb617e1c491caa3938c1329c526fb) --- 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 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 6f005d4d0967b5fe6b133ba5604399427d98ba21 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 23 Mar 2020 16:47:22 +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 eccba5baf..8eeb528e1 100644 --- a/config/common.mk +++ b/config/common.mk @@ -132,30 +132,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 8cd0d04dcbf1f138ca7821ab54cfba37d34eb8c7 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 6 Apr 2020 17:03:35 +0200 Subject: [PATCH 8/8] Revert "Add ecloud SMS support" This reverts commit 6f005d4d0967b5fe6b133ba5604399427d98ba21. --- config/common.mk | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/config/common.mk b/config/common.mk index 8eeb528e1..eccba5baf 100644 --- a/config/common.mk +++ b/config/common.mk @@ -132,31 +132,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