commit 3fc779e3e2b0f26a8d64d58142aa4db7098a7c19
author Alessandro Astone <ales.astone@gmail.com> Tue Jan 05 18:04:14 2021 +0100
committer Jackeagle <jackeagle102@gmail.com> Mon Jan 11 18:57:46 2021 +0100
tree 36ff7a09936ec9028e1d369a18e04b09e8db55d5
parent 91cbf5fd400160a394d4bcbbfcc93875ac29d90c

bliss: Commonize display_intf_headers for QSSI supported platforms

Change-Id: I7224c10295c4123222d81b92f7829502e3cc2d61
Signed-off-by: Jackeagle <jackeagle102@gmail.com>

build/soong/Android.bp

diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 86d5f08..6f7bd55 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -434,7 +434,7 @@
     name: "surfaceflinger_qcom_extensions",
     module_type: "cc_defaults",
     config_namespace: "blissQcomVars",
-    value_variables: ["qcom_soong_namespace"],
+    value_variables: ["qcom_display_headers_namespace"],
     properties: [
         "cppflags",
         "header_libs",
@@ -444,9 +444,9 @@
 surfaceflinger_qcom_extensions {
     name: "surfaceflinger_qcom_ext_defaults",
     soong_config_variables: {
-        qcom_soong_namespace: {
+        qcom_display_headers_namespace: {
             cppflags: ["-DQCOM_UM_FAMILY"],
-            header_libs: ["//%s/display:display_intf_headers"],
+            header_libs: ["//%s:display_intf_headers"],
         },
     },
 }

config/BoardConfigQcom.mk

diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 7bd1d03..e7ea0c0 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -15,6 +15,7 @@
 UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET) $(ATOLL)
 UM_4_19_FAMILY := $(KONA) $(LITO)
 UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY)
+QSSI_SUPPORTED_PLATFORMS := $(UM_4_9_FAMILY) $(UM_4_14_FAMILY) $(UM_4_19_FAMILY)
 
 BOARD_USES_ADRENO := true
 
@@ -97,6 +98,11 @@
 QCOM_SOONG_NAMESPACE ?= hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)
 PRODUCT_SOONG_NAMESPACES += $(QCOM_SOONG_NAMESPACE)
 
+# Add display-commonsys-intf to PRODUCT_SOONG_NAMESPACES for QSSI supported platforms
+ifneq ($(filter $(QSSI_SUPPORTED_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
+    PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/commonsys-intf/display
+endif
+
 # Add data-ipa-cfg-mgr to PRODUCT_SOONG_NAMESPACES if needed
 ifneq ($(USE_DEVICE_SPECIFIC_DATA_IPA_CFG_MGR),true)
     PRODUCT_SOONG_NAMESPACES += vendor/qcom/opensource/data-ipa-cfg-mgr

config/BoardConfigSoong.mk

diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index d8fd984..9e6d88c 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -55,10 +55,10 @@
     uses_qcom_bsp_legacy \
     uses_qti_camera_device
 
-# Only create soong_namespace var if dealing with UM platforms to avoid breaking build for all other platforms
+# Only create display_headers_namespace var if dealing with UM platforms to avoid breaking build for all other platforms
 ifneq ($(filter $(UM_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
 SOONG_CONFIG_blissQcomVars += \
-    qcom_soong_namespace
+    qcom_display_headers_namespace
 endif
 
 # Soong bool variables
@@ -91,8 +91,10 @@
 SOONG_CONFIG_blissGlobalVars_target_process_sdk_version_override := $(TARGET_PROCESS_SDK_VERSION_OVERRIDE)
 SOONG_CONFIG_blissGlobalVars_target_surfaceflinger_fod_lib := $(TARGET_SURFACEFLINGER_FOD_LIB)
 SOONG_CONFIG_blissGlobalVars_uses_camera_parameter_lib := $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY)
-ifneq ($(filter $(UM_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
-SOONG_CONFIG_blissQcomVars_qcom_soong_namespace := $(QCOM_SOONG_NAMESPACE)
+ifneq ($(filter $(QSSI_SUPPORTED_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
+SOONG_CONFIG_blissQcomVars_qcom_display_headers_namespace := vendor/qcom/opensource/commonsys-intf/display
+else
+SOONG_CONFIG_blissQcomVars_qcom_display_headers_namespace := $(QCOM_SOONG_NAMESPACE)/display
 endif
 
 ifneq ($(TARGET_USE_QTI_BT_STACK),true)