vendor: Add qcom platform type to soongs vars
Required for new commits on frameworks/native
* Fix lag during screen recording on some platforms
* Fix screen flickering after disconnecting from Android Auto on some platforms
Change-Id: Ia0ed0bbfda44fb5ccb184ace854ec1bf9a7d819a
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index 5cdcfd7..29247c0 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -48,6 +48,26 @@
Cppflags []string
Shared_libs []string
}
+ Uses_qcom_um_family struct {
+ Cflags []string
+ Srcs []string
+ }
+ Uses_qcom_um_3_18_family struct {
+ Header_libs []string
+ Shared_libs []string
+ }
+ Uses_qcom_um_4_4_family struct {
+ Header_libs []string
+ Shared_libs []string
+ }
+ Uses_qcom_um_4_9_family struct {
+ Header_libs []string
+ Shared_libs []string
+ }
+ Uses_qcom_um_4_14_family struct {
+ Header_libs []string
+ Shared_libs []string
+ }
}
type ProductVariables struct {
@@ -68,4 +88,9 @@
Uses_nvidia_enhancements *bool `json:",omitempty"`
Uses_qcom_bsp_legacy *bool `json:",omitempty"`
Uses_qti_camera_device *bool `json:",omitempty"`
+ Uses_qcom_um_family *bool `json:",omitempty"`
+ Uses_qcom_um_3_18_family *bool `json:",omitempty"`
+ Uses_qcom_um_4_4_family *bool `json:",omitempty"`
+ Uses_qcom_um_4_9_family *bool `json:",omitempty"`
+ Uses_qcom_um_4_14_family *bool `json:",omitempty"`
}
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index f421c58..dda7978 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -21,6 +21,11 @@
$(call add_json_bool, Uses_nvidia_enhancements, $(filter TRUE,$(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)))
$(call add_json_bool, Uses_qcom_bsp_legacy, $(filter true,$(TARGET_USES_QCOM_BSP_LEGACY)))
$(call add_json_bool, Uses_qti_camera_device, $(filter true,$(TARGET_USES_QTI_CAMERA_DEVICE)))
+$(call add_json_bool, Uses_qcom_um_family, $(filter true,$(TARGET_USES_QCOM_UM_FAMILY)))
+$(call add_json_bool, Uses_qcom_um_3_18_family, $(filter true,$(TARGET_USES_QCOM_UM_3_18_FAMILY)))
+$(call add_json_bool, Uses_qcom_um_4_4_family, $(filter true,$(TARGET_USES_QCOM_UM_4_4_FAMILY)))
+$(call add_json_bool, Uses_qcom_um_4_9_family, $(filter true,$(TARGET_USES_QCOM_UM_4_9_FAMILY)))
+$(call add_json_bool, Uses_qcom_um_4_14_family, $(filter true,$(TARGET_USES_QCOM_UM_4_14_FAMILY)))
# This causes the build system to strip out the last comma in our nested struct, to keep the JSON valid.
_contents := $(_contents)__SV_END
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 99339c0..5f00e9f 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -70,15 +70,23 @@
else ifneq ($(filter $(UM_3_18_FAMILY),$(TARGET_BOARD_PLATFORM)),)
MSM_VIDC_TARGET_LIST := $(UM_3_18_FAMILY)
QCOM_HARDWARE_VARIANT := msm8996
+ TARGET_USES_QCOM_UM_FAMILY := true
+ TARGET_USES_QCOM_UM_3_18_FAMILY := true
else ifneq ($(filter $(UM_4_4_FAMILY),$(TARGET_BOARD_PLATFORM)),)
MSM_VIDC_TARGET_LIST := $(UM_4_4_FAMILY)
QCOM_HARDWARE_VARIANT := msm8998
+ TARGET_USES_QCOM_UM_FAMILY := true
+ TARGET_USES_QCOM_UM_4_4_FAMILY := true
else ifneq ($(filter $(UM_4_9_FAMILY),$(TARGET_BOARD_PLATFORM)),)
MSM_VIDC_TARGET_LIST := $(UM_4_9_FAMILY)
QCOM_HARDWARE_VARIANT := sdm845
+ TARGET_USES_QCOM_UM_FAMILY := true
+ TARGET_USES_QCOM_UM_4_9_FAMILY := true
else ifneq ($(filter $(UM_4_14_FAMILY),$(TARGET_BOARD_PLATFORM)),)
MSM_VIDC_TARGET_LIST := $(UM_4_14_FAMILY)
QCOM_HARDWARE_VARIANT := sm8150
+ TARGET_USES_QCOM_UM_FAMILY := true
+ TARGET_USES_QCOM_UM_4_14_FAMILY := true
else
MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)
QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM)