lineage: Move QC board variables earlier
These variables are usually set in a device's BoardConfig, setting them
in qcom_target is at the very end of the "configuration process" which
results in them being unavailable to plenty of other configuration
"things" (ex. soong namespaces or soong config). Move them to right
after a device's BoardConfig has been found and loaded.
Change-Id: Iddd731202d22ed3f8eb010197ce20d3c75a1f40a
diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index 3502ed8..47baea3 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -1,5 +1,3 @@
-# Target-specific configuration
-
# Bring in Qualcomm helper macros
include vendor/lineage/build/core/qcom_utils.mk
@@ -21,83 +19,6 @@
endef
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
- 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
- UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY)
-
- BOARD_USES_ADRENO := true
-
- # UM platforms no longer need this set on O+
- ifneq ($(call is-board-platform-in-list, $(UM_PLATFORMS)),true)
- TARGET_USES_QCOM_BSP := true
- endif
-
- # Tell HALs that we're compiling an AOSP build with an in-line kernel
- TARGET_COMPILE_WITH_MSM_KERNEL := true
-
- ifneq ($(filter msm7x27a msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),)
- TARGET_USES_QCOM_BSP_LEGACY := true
- # Enable legacy audio functions
- ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
- USE_CUSTOM_AUDIO_POLICY := 1
- endif
- endif
-
- # Enable media extensions
- TARGET_USES_MEDIA_EXTENSIONS := true
-
- # Allow building audio encoders
- TARGET_USES_QCOM_MM_AUDIO := true
-
- # Enable color metadata for every UM platform
- ifeq ($(call is-board-platform-in-list, $(UM_PLATFORMS)),true)
- TARGET_USES_COLOR_METADATA := true
- endif
-
- # Enable DRM PP driver on UM platforms that support it
- ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY)),true)
- TARGET_USES_DRM_PP := true
- endif
-
- # List of targets that use master side content protection
- MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660 sdm845
-
- ifeq ($(call is-board-platform-in-list, $(B_FAMILY)),true)
- MSM_VIDC_TARGET_LIST := $(B_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8974
- else
- ifeq ($(call is-board-platform-in-list, $(B64_FAMILY)),true)
- MSM_VIDC_TARGET_LIST := $(B64_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8994
- else
- ifeq ($(call is-board-platform-in-list, $(BR_FAMILY)),true)
- MSM_VIDC_TARGET_LIST := $(BR_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8916
- else
- ifeq ($(call is-board-platform-in-list, $(UM_3_18_FAMILY)),true)
- MSM_VIDC_TARGET_LIST := $(UM_3_18_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8996
- else
- ifeq ($(call is-board-platform-in-list, $(UM_4_4_FAMILY)),true)
- MSM_VIDC_TARGET_LIST := $(UM_4_4_FAMILY)
- QCOM_HARDWARE_VARIANT := msm8998
- else
- ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY)),true)
- MSM_VIDC_TARGET_LIST := $(UM_4_9_FAMILY)
- QCOM_HARDWARE_VARIANT := sdm845
- else
- MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)
- QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM)
- endif
- endif
- endif
- endif
- endif
- endif
$(call set-device-specific-path,AUDIO,audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT))
$(call set-device-specific-path,DISPLAY,display,hardware/qcom/display-caf/$(QCOM_HARDWARE_VARIANT))
diff --git a/config/BoardConfigLineage.mk b/config/BoardConfigLineage.mk
index e097cce..e485b4a 100644
--- a/config/BoardConfigLineage.mk
+++ b/config/BoardConfigLineage.mk
@@ -3,7 +3,6 @@
BOARD_HAL_STATIC_LIBRARIES := libhealthd.lineage
endif
-# QCOM HW crypto
-ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
- TARGET_CRYPTFS_HW_PATH ?= vendor/qcom/opensource/cryptfs_hw
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+include vendor/lineage/config/BoardConfigQcom.mk
endif
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
new file mode 100644
index 0000000..cf53cf4
--- /dev/null
+++ b/config/BoardConfigQcom.mk
@@ -0,0 +1,85 @@
+# Bring in Qualcomm helper macros
+include vendor/lineage/build/core/qcom_utils.mk
+
+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
+UM_PLATFORMS := $(UM_3_18_FAMILY) $(UM_4_4_FAMILY) $(UM_4_9_FAMILY)
+
+BOARD_USES_ADRENO := true
+
+# UM platforms no longer need this set on O+
+ifneq ($(call is-board-platform-in-list, $(UM_PLATFORMS)),true)
+ TARGET_USES_QCOM_BSP := true
+endif
+
+# Tell HALs that we're compiling an AOSP build with an in-line kernel
+TARGET_COMPILE_WITH_MSM_KERNEL := true
+
+ifneq ($(filter msm7x27a msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),)
+ TARGET_USES_QCOM_BSP_LEGACY := true
+ # Enable legacy audio functions
+ ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
+ USE_CUSTOM_AUDIO_POLICY := 1
+ endif
+endif
+
+# Enable media extensions
+TARGET_USES_MEDIA_EXTENSIONS := true
+
+# Allow building audio encoders
+TARGET_USES_QCOM_MM_AUDIO := true
+
+# Enable color metadata for every UM platform
+ifeq ($(call is-board-platform-in-list, $(UM_PLATFORMS)),true)
+ TARGET_USES_COLOR_METADATA := true
+endif
+
+# Enable DRM PP driver on UM platforms that support it
+ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY)),true)
+ TARGET_USES_DRM_PP := true
+endif
+
+# List of targets that use master side content protection
+MASTER_SIDE_CP_TARGET_LIST := msm8996 msm8998 sdm660 sdm845
+
+ifeq ($(call is-board-platform-in-list, $(B_FAMILY)),true)
+ MSM_VIDC_TARGET_LIST := $(B_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8974
+else
+ifeq ($(call is-board-platform-in-list, $(B64_FAMILY)),true)
+ MSM_VIDC_TARGET_LIST := $(B64_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8994
+else
+ifeq ($(call is-board-platform-in-list, $(BR_FAMILY)),true)
+ MSM_VIDC_TARGET_LIST := $(BR_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8916
+else
+ifeq ($(call is-board-platform-in-list, $(UM_3_18_FAMILY)),true)
+ MSM_VIDC_TARGET_LIST := $(UM_3_18_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8996
+else
+ifeq ($(call is-board-platform-in-list, $(UM_4_4_FAMILY)),true)
+ MSM_VIDC_TARGET_LIST := $(UM_4_4_FAMILY)
+ QCOM_HARDWARE_VARIANT := msm8998
+else
+ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY)),true)
+ MSM_VIDC_TARGET_LIST := $(UM_4_9_FAMILY)
+ QCOM_HARDWARE_VARIANT := sdm845
+else
+ MSM_VIDC_TARGET_LIST := $(TARGET_BOARD_PLATFORM)
+ QCOM_HARDWARE_VARIANT := $(TARGET_BOARD_PLATFORM)
+endif
+endif
+endif
+endif
+endif
+endif
+
+# QCOM HW crypto
+ifeq ($(TARGET_HW_DISK_ENCRYPTION),true)
+ TARGET_CRYPTFS_HW_PATH ?= vendor/qcom/opensource/cryptfs_hw
+endif