From f70a639297743bf771b07c0cc6245e9236ec1f23 Mon Sep 17 00:00:00 2001
From: Philip Nagler-Frank <philip@nagler.world>
Date: Fri, 4 Feb 2022 16:19:28 +0100
Subject: [PATCH] Proper names and documentation for Nlp packages

---
 {MozillaNlpBackend => IchnaeaNlpBackend}/Android.mk |   2 +-
 .../org.microg.nlp.backend.ichnaea_20033.apk        | Bin
 .../Android.mk                                      |   2 +-
 .../org.microg.nlp.backend.nominatim_20042.apk      | Bin
 README.md                                           |   2 ++
 products/gms.mk                                     |   4 ++--
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename {MozillaNlpBackend => IchnaeaNlpBackend}/Android.mk (89%)
 rename {MozillaNlpBackend => IchnaeaNlpBackend}/org.microg.nlp.backend.ichnaea_20033.apk (100%)
 rename {NominatimNlpBackend => NominatimGeocoderBackend}/Android.mk (87%)
 rename {NominatimNlpBackend => NominatimGeocoderBackend}/org.microg.nlp.backend.nominatim_20042.apk (100%)

diff --git a/MozillaNlpBackend/Android.mk b/IchnaeaNlpBackend/Android.mk
similarity index 89%
rename from MozillaNlpBackend/Android.mk
rename to IchnaeaNlpBackend/Android.mk
index d25162c..c14372a 100644
--- a/MozillaNlpBackend/Android.mk
+++ b/IchnaeaNlpBackend/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := MozillaNlpBackend
+LOCAL_MODULE := IchnaeaNlpBackend
 LOCAL_SRC_FILES := org.microg.nlp.backend.ichnaea_20033.apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
diff --git a/MozillaNlpBackend/org.microg.nlp.backend.ichnaea_20033.apk b/IchnaeaNlpBackend/org.microg.nlp.backend.ichnaea_20033.apk
similarity index 100%
rename from MozillaNlpBackend/org.microg.nlp.backend.ichnaea_20033.apk
rename to IchnaeaNlpBackend/org.microg.nlp.backend.ichnaea_20033.apk
diff --git a/NominatimNlpBackend/Android.mk b/NominatimGeocoderBackend/Android.mk
similarity index 87%
rename from NominatimNlpBackend/Android.mk
rename to NominatimGeocoderBackend/Android.mk
index 47a0075..47b67b8 100644
--- a/NominatimNlpBackend/Android.mk
+++ b/NominatimGeocoderBackend/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := NominatimNlpBackend
+LOCAL_MODULE := NominatimGeocoderBackend
 LOCAL_SRC_FILES := org.microg.nlp.backend.nominatim_20042.apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
diff --git a/NominatimNlpBackend/org.microg.nlp.backend.nominatim_20042.apk b/NominatimGeocoderBackend/org.microg.nlp.backend.nominatim_20042.apk
similarity index 100%
rename from NominatimNlpBackend/org.microg.nlp.backend.nominatim_20042.apk
rename to NominatimGeocoderBackend/org.microg.nlp.backend.nominatim_20042.apk
diff --git a/README.md b/README.md
index fec9de6..8dd2ceb 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,8 @@ The included APKs are:
    * GmsCore: the main component of microG, a FOSS reimplementation of the Google Play Services (requires GsfProxy and FakeStore for full functionality)
    * GsfProxy: a GmsCore proxy for legacy GCM compatibility
    * FakeStore: an empty package that mocks the existence of the Google Play Store
+   * IchnaeaNlpBackend: Network location provider using Mozilla Location Service
+   * NominatimGeocoderBackend: Geocoder backend that uses OSM Nominatim service.
 
 These are official unmodified prebuilt binaries, signed by the
 corresponding developers.
diff --git a/products/gms.mk b/products/gms.mk
index 976dce0..dfbd889 100644
--- a/products/gms.mk
+++ b/products/gms.mk
@@ -2,8 +2,8 @@ PRODUCT_PACKAGES += \
 	GmsCore \
 	GsfProxy \
 	FakeStore \
-	MozillaNlpBackend \
-	NominatimNlpBackend \
+	IchnaeaNlpBackend \
+	NominatimGeocoderBackend \
 	FDroid \
 	FDroidPrivilegedExtension \
 	additional_repos.xml