From df0187395ec3d5f6767b5da631d24120dbc2cacf Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 1 Mar 2021 18:11:31 +0100
Subject: [PATCH] Wrong path for overlay, and add CI for it

---
 Umidigi/A3S/Android.mk | 2 +-
 tests/tests.sh         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Umidigi/A3S/Android.mk b/Umidigi/A3S/Android.mk
index a22fc28..798aabf 100644
--- a/Umidigi/A3S/Android.mk
+++ b/Umidigi/A3S/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_PACKAGE_NAME := treble-overlay-umidigi-A3S
-LOCAL_MODULE_PATH := $(TARGET_OUT)/overlay
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
 LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
diff --git a/tests/tests.sh b/tests/tests.sh
index e3d0d38..7985db1 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -49,6 +49,10 @@ find . -name AndroidManifest.xml |while read -r manifest;do
 			'TESTS: Ignore ro.vendor.product.'
 	fi
 
+    if grep -qF '$(TARGET_OUT)' "$folder/Android.mk";then
+        fail "$folder/Android.mk" "is wrongly pushing overlay in system/overlay rather than product/overlay"
+    fi
+
 	#Ensure the overloaded properties exist in AOSP
 	find "$folder" -name \*.xml |while read -r xml;do
 		keys="$(xmlstarlet sel -t -m '//resources/*' -v @name -n "$xml")"