StrixOS/vendor_strix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "vendor: Add qcom platform type to soongs vars"

Browse Source 
These vars are no longer useful as of Q because it looks like CAF dropped
their surfaceflinger extensions (ExtSurfaceFlinger).

This reverts commit 97cb87c809.

Change-Id: I09701f6a47830a30486f35052b4ea7ab15a9660b
This commit is contained in:
Bruno Martins
2019-09-28 23:25:02 +01:00
parent 119f9d1759
commit 5c9d6c40e3
3 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
build/soong/android/variable.go
View File

@@ -47,26 +47,6 @@ type Product_variables struct {
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 {
@@ -85,9 +65,4 @@ type ProductVariables struct {
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"`
}

5
build/soong/soong_config.mk
View File

@@ -19,11 +19,6 @@ $(call add_json_bool, Uses_generic_camera_parameter_library, $(if $(TARGET_SPECI
$(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.
_json_contents := $(_json_contents)__SV_END

8
config/BoardConfigQcom.mk
View File

@@ -70,23 +70,15 @@ else ifneq ($(filter $(BR_FAMILY),$(TARGET_BOARD_PLATFORM)),)
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)