Commit 36cda6d6 authored by Romain Hunault's avatar Romain Hunault

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents 6243f7b8 97cb87c8
......@@ -48,6 +48,26 @@ 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 {
......@@ -68,4 +88,9 @@ 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"`
}
......@@ -21,6 +21,11 @@ $(call add_json_bool, Uses_metadata_as_fde_key, $(filter true,$(TARGET_USES_META
$(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
......
......@@ -70,15 +70,23 @@ 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)
......
......@@ -44,7 +44,6 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/notifications/Aldebaran.ogg:system/media/audio/notifications/Aldebaran.ogg \
$(LOCAL_PATH)/notifications/Altair.ogg:system/media/audio/notifications/Altair.ogg \
$(LOCAL_PATH)/notifications/Antares.ogg:system/media/audio/notifications/Antares.ogg \
$(LOCAL_PATH)/notifications/arcturus.ogg:system/media/audio/notifications/arcturus.ogg \
$(LOCAL_PATH)/notifications/Beat_Box_Android.ogg:system/media/audio/notifications/Beat_Box_Android.ogg \
$(LOCAL_PATH)/notifications/Betelgeuse.ogg:system/media/audio/notifications/Betelgeuse.ogg \
$(LOCAL_PATH)/notifications/Canopus.ogg:system/media/audio/notifications/Canopus.ogg \
......@@ -100,8 +99,7 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/notifications/sirius.ogg:system/media/audio/notifications/sirius.ogg \
$(LOCAL_PATH)/notifications/Sirrah.ogg:system/media/audio/notifications/Sirrah.ogg \
$(LOCAL_PATH)/notifications/TaDa.ogg:system/media/audio/notifications/TaDa.ogg \
$(LOCAL_PATH)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg \
$(LOCAL_PATH)/notifications/vega.ogg:system/media/audio/notifications/vega.ogg
$(LOCAL_PATH)/notifications/tweeters.ogg:system/media/audio/notifications/tweeters.ogg
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/Ring_Classic_02.ogg:system/media/audio/ringtones/Ring_Classic_02.ogg \
......@@ -197,3 +195,7 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/ringtones/ogg/Zeta.ogg:system/media/audio/ringtones/Zeta.ogg \
$(LOCAL_PATH)/ringtones/Testudo.ogg:system/media/audio/ringtones/Testudo.ogg \
$(LOCAL_PATH)/ringtones/Vespa.ogg:system/media/audio/ringtones/Vespa.ogg
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/effects/ogg/ChargingStarted.ogg:system/media/audio/notifications/ChargingStarted.ogg \
$(LOCAL_PATH)/effects/material/ogg/WirelessChargingStarted.ogg:system/media/audio/notifications/WirelessChargingStarted.ogg
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment