g12: Define Soong namespaces in the common product makefile

This is where it belongs.

Change-Id: Ibea0e8fe5dbc26d8953a9735f0b38cf087805b76

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 8c07769772d74a74fa7888fbd9df4a9b1a5b3da8..22cf59ded4a9ae12f7c4469597280eb82e66b5c2 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -122,9 +122,6 @@ TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
 BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 PRODUCT_PRIVATE_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/private
 
-## Soong Namespace
-PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH)
-
 ## Treble
 BOARD_VNDK_VERSION := current
 

diff --git a/g12.mk b/g12.mk
index cb9e9174c3a7590028918abb799cbb4a49b5d3bd..a42cf0b33341022d1461e439d28a43751d06e323 100644 (file)
--- a/g12.mk
+++ b/g12.mk
@@ -206,6 +206,10 @@ TARGET_AMLOGIC_SOC ?= g12a
 ## Shipping API
 PRODUCT_SHIPPING_API_LEVEL := 29
 
+## Soong namespaces
+PRODUCT_SOONG_NAMESPACES += \
+    $(LOCAL_PATH)
+
 ## Thermal
 PRODUCT_PACKAGES += \
     android.hardware.thermal@2.0.vendor