From abaf879230b239d93cb879e49ad1b8f046c4a539 Mon Sep 17 00:00:00 2001
From: Philip Nagler-Frank <philip@nagler.world>
Date: Thu, 24 Feb 2022 20:54:31 +0100
Subject: [PATCH] remove LOCAL_MODULE_TAGS := optional since it's the default
 anyways

---
 FDroid/Android.mk                    | 1 -
 FDroidPrivilegedExtension/Android.mk | 2 --
 FakeStore/Android.mk                 | 2 --
 GmsCore/Android.mk                   | 3 ---
 GsfProxy/Android.mk                  | 1 -
 IchnaeaNlpBackend/Android.mk         | 1 -
 NominatimGeocoderBackend/Android.mk  | 1 -
 additional_repos.xml/Android.mk      | 1 -
 8 files changed, 12 deletions(-)

diff --git a/FDroid/Android.mk b/FDroid/Android.mk
index 3c02033..9db520a 100644
--- a/FDroid/Android.mk
+++ b/FDroid/Android.mk
@@ -1,6 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := FDroid
 LOCAL_SRC_FILES := FDroid.apk
 LOCAL_MODULE_CLASS := APPS
diff --git a/FDroidPrivilegedExtension/Android.mk b/FDroidPrivilegedExtension/Android.mk
index df5b20a..3c0cd63 100644
--- a/FDroidPrivilegedExtension/Android.mk
+++ b/FDroidPrivilegedExtension/Android.mk
@@ -2,14 +2,12 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := privapp-permissions-org.fdroid.fdroid.privileged.xml
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := FDroidPrivilegedExtension
 LOCAL_SRC_FILES := FDroidPrivilegedExtension.apk
 LOCAL_MODULE_CLASS := APPS
diff --git a/FakeStore/Android.mk b/FakeStore/Android.mk
index 939850b..63907ba 100644
--- a/FakeStore/Android.mk
+++ b/FakeStore/Android.mk
@@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := privapp-permissions-com.android.vending.xml
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
@@ -16,7 +15,6 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := FakeStore
 LOCAL_SRC_FILES := FakeStore.apk
 LOCAL_MODULE_CLASS := APPS
diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index b05efd8..b5744ed 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := privapp-permissions-com.google.android.gms.xml
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
@@ -17,14 +16,12 @@ include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := sysconfig-com.google.android.gms.xml
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/sysconfig
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := GmsCore
 LOCAL_SRC_FILES := GmsCore.apk
 LOCAL_MODULE_CLASS := APPS
diff --git a/GsfProxy/Android.mk b/GsfProxy/Android.mk
index 38e515f..248d922 100644
--- a/GsfProxy/Android.mk
+++ b/GsfProxy/Android.mk
@@ -1,6 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := GsfProxy
 LOCAL_SRC_FILES := GsfProxy.apk
 LOCAL_MODULE_CLASS := APPS
diff --git a/IchnaeaNlpBackend/Android.mk b/IchnaeaNlpBackend/Android.mk
index 7edda3d..e98539f 100644
--- a/IchnaeaNlpBackend/Android.mk
+++ b/IchnaeaNlpBackend/Android.mk
@@ -1,6 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := IchnaeaNlpBackend
 LOCAL_SRC_FILES := IchnaeaNlpBackend.apk
 LOCAL_MODULE_CLASS := APPS
diff --git a/NominatimGeocoderBackend/Android.mk b/NominatimGeocoderBackend/Android.mk
index 0f089e0..1689d20 100644
--- a/NominatimGeocoderBackend/Android.mk
+++ b/NominatimGeocoderBackend/Android.mk
@@ -1,6 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := NominatimGeocoderBackend
 LOCAL_SRC_FILES := NominatimGeocoderBackend.apk
 LOCAL_MODULE_CLASS := APPS
diff --git a/additional_repos.xml/Android.mk b/additional_repos.xml/Android.mk
index fd85abe..87892d4 100644
--- a/additional_repos.xml/Android.mk
+++ b/additional_repos.xml/Android.mk
@@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := additional_repos.xml
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/org.fdroid.fdroid
 LOCAL_SRC_FILES := additional_repos.xml