diff --git a/FDroid/Android.mk b/FDroid/Android.mk
index 2fe22a8..3c02033 100644
--- a/FDroid/Android.mk
+++ b/FDroid/Android.mk
@@ -6,4 +6,5 @@
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
diff --git a/FDroidPrivilegedExtension/Android.mk b/FDroidPrivilegedExtension/Android.mk
index b6e8279..4461234 100644
--- a/FDroidPrivilegedExtension/Android.mk
+++ b/FDroidPrivilegedExtension/Android.mk
@@ -6,6 +6,7 @@
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -17,5 +18,6 @@
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_REQUIRED_MODULES := privapp-permissions-org.fdroid.fdroid.privileged.xml
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
diff --git a/FakeStore/Android.mk b/FakeStore/Android.mk
index 74c8f26..b511004 100644
--- a/FakeStore/Android.mk
+++ b/FakeStore/Android.mk
@@ -6,6 +6,7 @@
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -17,5 +18,6 @@
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_REQUIRED_MODULES := privapp-permissions-com.android.vending.xml
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index a8b5985..f886838 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -6,6 +6,7 @@
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -14,6 +15,7 @@
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -26,5 +28,6 @@
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_OVERRIDES_PACKAGES := com.qualcomm.location
 LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml sysconfig-com.google.android.gms.xml
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
 
diff --git a/GsfProxy/Android.mk b/GsfProxy/Android.mk
index a284908..38e515f 100644
--- a/GsfProxy/Android.mk
+++ b/GsfProxy/Android.mk
@@ -6,4 +6,5 @@
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
diff --git a/IchnaeaNlpBackend/Android.mk b/IchnaeaNlpBackend/Android.mk
index c63ce3a..7edda3d 100644
--- a/IchnaeaNlpBackend/Android.mk
+++ b/IchnaeaNlpBackend/Android.mk
@@ -6,4 +6,5 @@
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
diff --git a/NominatimGeocoderBackend/Android.mk b/NominatimGeocoderBackend/Android.mk
index 47838e8..0f089e0 100644
--- a/NominatimGeocoderBackend/Android.mk
+++ b/NominatimGeocoderBackend/Android.mk
@@ -6,4 +6,5 @@
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)
diff --git a/additional_repos.xml/Android.mk b/additional_repos.xml/Android.mk
index 7ad9d57..d4934d6 100644
--- a/additional_repos.xml/Android.mk
+++ b/additional_repos.xml/Android.mk
@@ -6,5 +6,6 @@
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/org.fdroid.fdroid
 LOCAL_SRC_FILES := additional_repos.xml
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PREBUILT)