Merge "vendor/bliss: Include vendor/themes" into q10
diff --git a/build/soong/android/variable.go b/build/soong/android/variable.go
index 39008d8..32fc6b5 100644
--- a/build/soong/android/variable.go
+++ b/build/soong/android/variable.go
@@ -47,26 +47,6 @@
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 @@
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 27f86ff..1f022ec 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -19,11 +19,6 @@
$(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
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 85fe011..e531046 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -48,6 +48,8 @@
# Mark 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
@@ -70,23 +72,15 @@
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)