vendor: Clean up QCOM defs in single BoardConfig
Note: Below is removed.
ifneq ($(FORCE_QCOM_DISPLAY_HAL_VARIANT),)
QCOM_HARDWARE_VARIANT := $(FORCE_QCOM_DISPLAY_HAL_VARIANT)
Use OVERRIDE_QCOM_HARDWARE_VARIANT is entire hardware variant needs to be replaced.
Use FORCE_QCOM_DISPLAY_HAL_VARIANT only if display hal needs to replaced.
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Change-Id: Ic5535a5e1fd962a510a2a3374b5d184e69175fd5
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index 384788d..55041d1 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -1,5 +1,3 @@
-include vendor/bliss/config/BoardConfigQcomDefs.mk
-
add_json_str_omitempty = $(if $(strip $(2)),$(call add_json_str, $(1), $(2)))
add_json_val_default = $(call add_json_val, $(1), $(if $(strip $(2)), $(2), $(3)))
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 3b0ebdc..9c7699e 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -1,5 +1,17 @@
-include vendor/bliss/config/BoardConfigQcomDefs.mk
+# Platform names
+MSMNILE := msmnile #SM8150
+MSMSTEPPE := sm6150
+TRINKET := trinket #SM6125
+B_FAMILY := msm8226 msm8610 msm8974
+B64_FAMILY := msm8992 msm8994
+BR_FAMILY := msm8909 msm8916
+UM_3_18_FAMILY := msm8937 msm8953 msm8996
+UM_4_4_FAMILY := msm8998 sdm660
+UM_4_9_FAMILY := sdm845 sdm710
+UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET)
+UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)
+
BOARD_USES_ADRENO := true
# UM platforms no longer need this set on O+
@@ -34,17 +46,64 @@
TARGET_USES_DRM_PP := true
endif
-# Mark GRALLOC_USAGE_PRIVATE_WFD as valid gralloc bits
+# Mark GRALLOC_USAGE_HW_2D, GRALLOC_USAGE_EXTERNAL_DISP and GRALLOC_USAGE_PRIVATE_WFD as valid gralloc bits
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 10)
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 13)
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 21)
-# Mark GRALLOC_USAGE_PRIVATE_10BIT_TP as valid gralloc bits on UM platforms that support it
+# Mark GRALLOC_USAGE_PRIVATE_HEIF_VIDEO as valid gralloc bits on UM platforms that support it
ifneq ($(filter $(UM_4_9_FAMILY) $(UM_4_14_FAMILY),$(TARGET_BOARD_PLATFORM)),)
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 27)
endif
-# Allow a device to opt-out hardset of PRODUCT_SOONG_NAMESPACES
-QCOM_SOONG_NAMESPACE ?= hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)
-PRODUCT_SOONG_NAMESPACES += $(QCOM_SOONG_NAMESPACE)
+# List of targets that use master side content protection
+MASTER_SIDE_CP_TARGET_LIST := msm8996 $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)
+
+ifneq ($(OVERRIDE_QCOM_HARDWARE_VARIANT),)
+ QCOM_HARDWARE_VARIANT := $(OVERRIDE_QCOM_HARDWARE_VARIANT)
+else ifneq ($(filter $(B_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(B_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8974
+else ifneq ($(filter $(B64_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(B64_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8994
+else ifneq ($(filter $(BR_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(BR_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8916
+else ifneq ($(filter $(UM_3_18_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(UM_3_18_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8996
+else ifneq ($(filter $(UM_4_4_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(UM_4_4_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8998
+else ifneq ($(filter $(UM_4_9_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(UM_4_9_FAMILY)
+ QCOM_HARDWARE_VARIANT := sdm845
+else ifneq ($(filter $(UM_4_14_FAMILY),$(TARGET_BOARD_PLATFORM)),)
+ MSM_VIDC_TARGET_LIST := $(UM_4_14_FAMILY)
+ QCOM_HARDWARE_VARIANT := sm8150
+else
+ MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)
+ QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM)
+endif
+
+ifneq ($(TARGET_USE_AOSP_SURFACEFLINGER), true)
+ # Required for frameworks/native
+ ifeq ($(QCOM_HARDWARE_VARIANT),msm8996)
+ TARGET_USES_QCOM_UM_FAMILY := true
+ TARGET_USES_QCOM_UM_3_18_FAMILY := true
+ else ifeq ($(QCOM_HARDWARE_VARIANT),msm8998)
+ TARGET_USES_QCOM_UM_FAMILY := true
+ TARGET_USES_QCOM_UM_4_4_FAMILY := true
+ else ifeq ($(QCOM_HARDWARE_VARIANT),sdm845)
+ TARGET_USES_QCOM_UM_FAMILY := true
+ TARGET_USES_QCOM_UM_4_9_FAMILY := true
+ else ifeq ($(QCOM_HARDWARE_VARIANT),sm8150)
+ TARGET_USES_QCOM_UM_FAMILY := true
+ TARGET_USES_QCOM_UM_4_14_FAMILY := true
+ endif
+endif
+
+PRODUCT_SOONG_NAMESPACES += \
+ hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)
diff --git a/config/BoardConfigQcomDefs.mk b/config/BoardConfigQcomDefs.mk
deleted file mode 100644
index a2d7fcf..0000000
--- a/config/BoardConfigQcomDefs.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# Platform names
-MSMNILE := msmnile #SM8150
-MSMSTEPPE := sm6150
-TRINKET := trinket #SM6125
-
-B_FAMILY := msm8226 msm8610 msm8974
-B64_FAMILY := msm8992 msm8994
-BR_FAMILY := msm8909 msm8916
-UM_3_18_FAMILY := msm8937 msm8953 msm8996
-UM_4_4_FAMILY := msm8998 sdm660
-UM_4_9_FAMILY := sdm845 sdm710
-UM_4_14_FAMILY := $(MSMNILE) $(MSMSTEPPE) $(TRINKET)
-UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)
-
-# List of targets that use master side content protection
-MASTER_SIDE_CP_TARGET_LIST := msm8996 $(UM_4_4_FAMILY) $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)
-
-ifneq ($(FORCE_QCOM_DISPLAY_HAL_VARIANT),)
- QCOM_HARDWARE_VARIANT := $(FORCE_QCOM_DISPLAY_HAL_VARIANT)
-else ifneq ($(filter $(B_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(B_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8974
-else ifneq ($(filter $(B64_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(B64_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8994
-else ifneq ($(filter $(BR_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(BR_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8916
-else ifneq ($(filter $(UM_3_18_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(UM_3_18_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8996
-else ifneq ($(filter $(UM_4_4_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(UM_4_4_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8998
-else ifneq ($(filter $(UM_4_9_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(UM_4_9_FAMILY)
- QCOM_HARDWARE_VARIANT := sdm845
-else ifneq ($(filter $(UM_4_14_FAMILY),$(TARGET_BOARD_PLATFORM)),)
- MSM_VIDC_TARGET_LIST := $(UM_4_14_FAMILY)
- QCOM_HARDWARE_VARIANT := sm8150
-else
- MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)
- QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM)
-endif
-
-# Allow a device to manually override which HALs it wants to use
-ifneq ($(OVERRIDE_QCOM_HARDWARE_VARIANT),)
-QCOM_HARDWARE_VARIANT := $(OVERRIDE_QCOM_HARDWARE_VARIANT)
-endif
-
-ifneq ($(TARGET_USE_AOSP_SURFACEFLINGER), true)
- # Required for frameworks/native
- ifeq ($(QCOM_HARDWARE_VARIANT),msm8996)
- TARGET_USES_QCOM_UM_FAMILY := true
- TARGET_USES_QCOM_UM_3_18_FAMILY := true
- else ifeq ($(QCOM_HARDWARE_VARIANT),msm8998)
- TARGET_USES_QCOM_UM_FAMILY := true
- TARGET_USES_QCOM_UM_4_4_FAMILY := true
- else ifeq ($(QCOM_HARDWARE_VARIANT),sdm845)
- TARGET_USES_QCOM_UM_FAMILY := true
- TARGET_USES_QCOM_UM_4_9_FAMILY := true
- else ifeq ($(QCOM_HARDWARE_VARIANT),sm8150)
- TARGET_USES_QCOM_UM_FAMILY := true
- TARGET_USES_QCOM_UM_4_14_FAMILY := true
- endif
-endif