overlays: fix Android.mk - we dont really build LOCAL_PRODUCT_MODULE = true
add an empty product overlay for testing
Change-Id: I242183d40ff15d279b80d2ff6c9ffef2dec03b82
diff --git a/themes/overlays/AccentColorBlueMondayOverlay/Android.mk b/themes/overlays/AccentColorBlueMondayOverlay/Android.mk
index 178b52d..c66ab24 100644
--- a/themes/overlays/AccentColorBlueMondayOverlay/Android.mk
+++ b/themes/overlays/AccentColorBlueMondayOverlay/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := AccentColorBlueMonday
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk b/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk
index 1cd8825..d30f556 100644
--- a/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk
+++ b/themes/overlays/AccentColorGoldenShowerOverlay/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := AccentColorGoldenShower
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/AccentColorOmniOverlay/Android.mk b/themes/overlays/AccentColorOmniOverlay/Android.mk
index b35b1bf..5f9fb3f 100644
--- a/themes/overlays/AccentColorOmniOverlay/Android.mk
+++ b/themes/overlays/AccentColorOmniOverlay/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := AccentColorOmni
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/AccentColorRedDevilOverlay/Android.mk b/themes/overlays/AccentColorRedDevilOverlay/Android.mk
index 03f661e..7478696 100644
--- a/themes/overlays/AccentColorRedDevilOverlay/Android.mk
+++ b/themes/overlays/AccentColorRedDevilOverlay/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := AccentColorRedDevil
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk b/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk
index 182efbf..47381a5 100644
--- a/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk
+++ b/themes/overlays/AccentColorSluttyPinkOverlay/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := AccentColorSluttyPink
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/EmptyOverlay/Android.mk b/themes/overlays/EmptyOverlay/Android.mk
index 47fe08d..cf3ef0c 100644
--- a/themes/overlays/EmptyOverlay/Android.mk
+++ b/themes/overlays/EmptyOverlay/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := EmptyOverlay
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := EmptyOverlay
diff --git a/themes/overlays/EmptyProductOverlay/Android.mk b/themes/overlays/EmptyProductOverlay/Android.mk
new file mode 100644
index 0000000..6635868
--- /dev/null
+++ b/themes/overlays/EmptyProductOverlay/Android.mk
@@ -0,0 +1,29 @@
+#
+# Copyright 2018, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_RRO_THEME := EmptyProductOverlay
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PACKAGE_NAME := EmptyProductOverlay
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/EmptyProductOverlay/AndroidManifest.xml b/themes/overlays/EmptyProductOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..e52d72e
--- /dev/null
+++ b/themes/overlays/EmptyProductOverlay/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="org.omnirom.overlay.product.empty" platformBuildVersionCode="29" platformBuildVersionName="10">
+ <overlay android:targetPackage="android"/>
+ <application android:label="OmniROM Empty Product Overlay" android:hasCode="false"/>
+</manifest>
diff --git a/themes/overlays/EmptyProductOverlay/README.txt b/themes/overlays/EmptyProductOverlay/README.txt
new file mode 100644
index 0000000..a3342f3
--- /dev/null
+++ b/themes/overlays/EmptyProductOverlay/README.txt
@@ -0,0 +1 @@
+Empty "fake" product overlay for testing
diff --git a/themes/overlays/FontLatoSourceOverlay/Android.mk b/themes/overlays/FontLatoSourceOverlay/Android.mk
index 7e18d1a..6656b34 100644
--- a/themes/overlays/FontLatoSourceOverlay/Android.mk
+++ b/themes/overlays/FontLatoSourceOverlay/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := FontLatoSource
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/FontMuliSourceOverlay/Android.mk b/themes/overlays/FontMuliSourceOverlay/Android.mk
index 80f375a..4fe327f 100644
--- a/themes/overlays/FontMuliSourceOverlay/Android.mk
+++ b/themes/overlays/FontMuliSourceOverlay/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := FontMuliSource
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/PrimaryColorDarkBlue/Android.mk b/themes/overlays/PrimaryColorDarkBlue/Android.mk
index aab4063..d9f169c 100644
--- a/themes/overlays/PrimaryColorDarkBlue/Android.mk
+++ b/themes/overlays/PrimaryColorDarkBlue/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := PrimaryColorDarkBlue
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/PrimaryColorDeepBlue/Android.mk b/themes/overlays/PrimaryColorDeepBlue/Android.mk
index 2e77d08..66a057e 100644
--- a/themes/overlays/PrimaryColorDeepBlue/Android.mk
+++ b/themes/overlays/PrimaryColorDeepBlue/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := PrimaryColorDeepBlue
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
diff --git a/themes/overlays/PrimaryColorOmniBlack/Android.mk b/themes/overlays/PrimaryColorOmniBlack/Android.mk
index 219c532..a5bf351 100644
--- a/themes/overlays/PrimaryColorOmniBlack/Android.mk
+++ b/themes/overlays/PrimaryColorOmniBlack/Android.mk
@@ -19,8 +19,6 @@
LOCAL_RRO_THEME := PrimaryColorOmniBlack
-LOCAL_PRODUCT_MODULE := true
-
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res