omni: Move all Qcom board flags to BoardConfigQcom.mk
It fix the board Qcom flag called to early and not added into soong, like PRODUCT_CFI_INCLUDE_PATHS and PRODUCT_SOONG_NAMESPACES
Change-Id: Ia0d34e06319d12c0b4c4c863edf3b2d43b4e5956
diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index 19ed739..d5074f4 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -2,49 +2,6 @@
include vendor/omni/build/core/qcom_utils.mk
include vendor/omni/build/core/pathmap.mk
-# Target-specific configuration
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
- qcom_flags := -DQCOM_HARDWARE
- ifeq ($(TARGET_USES_QCOM_BSP),true)
- qcom_flags += -DQCOM_BSP
- qcom_flags += -DQTI_BSP
- endif
-
-# TARGET_GLOBAL_CFLAGS += $(qcom_flags)
-# TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
- PRIVATE_TARGET_GLOBAL_CFLAGS += $(qcom_flags)
- PRIVATE_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
-
- # Multiarch needs these too..
-# 2ND_TARGET_GLOBAL_CFLAGS += $(qcom_flags)
-# 2ND_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
-# 2ND_CLANG_TARGET_GLOBAL_CFLAGS += $(qcom_flags)
-# 2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
-
- TARGET_COMPILE_WITH_MSM_KERNEL := true
- MSM_VIDC_TARGET_LIST := \
- msm8974 \
- msm8610 \
- msm8226 \
- apq8084 \
- msm8916 \
- msm8937 \
- msm8952 \
- msm8953 \
- msm8994 \
- msm8909 \
- msm8992 \
- msm8996 \
- msm8998 \
- sdm660 \
- sdm710 \
- sdm845 \
- sm8150 \
- msmnile \
- sm6150 \
- kona
-endif
-
# Set device-specific HALs into project pathmap
define set-device-specific-path
$(if $(USE_DEVICE_SPECIFIC_$(1)), \
@@ -54,20 +11,3 @@
$(eval path := $(3))) \
$(call project-set-path,qcom-$(2),$(strip $(path)))
endef
-
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-
-$(call set-device-specific-path,AUDIO,audio,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/audio)
-$(call set-device-specific-path,DISPLAY,display,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/display)
-$(call set-device-specific-path,MEDIA,media,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/media)
-
-$(call set-device-specific-path,BT_VENDOR,bt-vendor,hardware/qcom-caf/bt)
-$(call set-device-specific-path,DATA_IPA_CFG_MGR,data-ipa-cfg-mgr,vendor/qcom/opensource/data-ipa-cfg-mgr)
-$(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource/dataservices)
-$(call set-device-specific-path,VR,vr,hardware/qcom-caf/vr)
-$(call set-device-specific-path,WLAN,wlan,hardware/qcom-caf/wlan)
-
-PRODUCT_CFI_INCLUDE_PATHS += \
- hardware/qcom-caf/wlan/qcwcn/wpa_supplicant_8_lib
-
-endif
diff --git a/build/core/qcom_utils.mk b/build/core/qcom_utils.mk
index df2ce4f..c9d6d1c 100755
--- a/build/core/qcom_utils.mk
+++ b/build/core/qcom_utils.mk
@@ -1,47 +1,3 @@
-# Board platforms lists to be used for
-# TARGET_BOARD_PLATFORM specific featurization
-QCOM_BOARD_PLATFORMS := msm7627_surf
-QCOM_BOARD_PLATFORMS += msm7627_6x
-QCOM_BOARD_PLATFORMS += msm7627a
-QCOM_BOARD_PLATFORMS += msm7630_surf
-QCOM_BOARD_PLATFORMS += msm7630_fusion
-QCOM_BOARD_PLATFORMS += msm8226
-QCOM_BOARD_PLATFORMS += msm8660
-QCOM_BOARD_PLATFORMS += msm8909
-QCOM_BOARD_PLATFORMS += msm8916
-QCOM_BOARD_PLATFORMS += msm8939
-QCOM_BOARD_PLATFORMS += msm8937
-QCOM_BOARD_PLATFORMS += msm8952
-QCOM_BOARD_PLATFORMS += msm8953
-QCOM_BOARD_PLATFORMS += msm8960
-QCOM_BOARD_PLATFORMS += msm8974
-QCOM_BOARD_PLATFORMS += msm8992
-QCOM_BOARD_PLATFORMS += msm8994
-QCOM_BOARD_PLATFORMS += msm8996
-QCOM_BOARD_PLATFORMS += msm8998
-QCOM_BOARD_PLATFORMS += apq8084
-QCOM_BOARD_PLATFORMS += sdm660
-QCOM_BOARD_PLATFORMS += sdm710
-QCOM_BOARD_PLATFORMS += sdm845
-QCOM_BOARD_PLATFORMS += sm8150
-QCOM_BOARD_PLATFORMS += msmnile
-QCOM_BOARD_PLATFORMS += kona
-QCOM_BOARD_PLATFORMS += sm6150
-QCOM_BOARD_PLATFORMS += sm8250
-QCOM_BOARD_PLATFORMS += lahaina
-QCOM_BOARD_PLATFORMS += sm8350
-QCOM_BOARD_PLATFORMS += taro
-
-MSM7K_BOARD_PLATFORMS := msm7630_surf
-MSM7K_BOARD_PLATFORMS += msm7630_fusion
-MSM7K_BOARD_PLATFORMS += msm7627_surf
-MSM7K_BOARD_PLATFORMS += msm7627_6x
-MSM7K_BOARD_PLATFORMS += msm7627a
-MSM7K_BOARD_PLATFORMS += msm7k
-
-QSD8K_BOARD_PLATFORMS := qsd8k
-
-
# vars for use by utils
colon := $(empty):$(empty)
underscore := $(empty)_$(empty)
diff --git a/config/BoardConfigOmni.mk b/config/BoardConfigOmni.mk
index 5a47ce5..095ff8c 100644
--- a/config/BoardConfigOmni.mk
+++ b/config/BoardConfigOmni.mk
@@ -2,4 +2,8 @@
include vendor/omni/config/BoardConfigKernel.mk
endif
+ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
+include vendor/omni/config/BoardConfigQcom.mk
+endif
+
include vendor/omni/config/BoardConfigSoong.mk
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
new file mode 100644
index 0000000..e2d8a09
--- /dev/null
+++ b/config/BoardConfigQcom.mk
@@ -0,0 +1,93 @@
+# Board platforms lists to be used for
+# TARGET_BOARD_PLATFORM specific featurization
+QCOM_BOARD_PLATFORMS := msm7627_surf
+QCOM_BOARD_PLATFORMS += msm7627_6x
+QCOM_BOARD_PLATFORMS += msm7627a
+QCOM_BOARD_PLATFORMS += msm7630_surf
+QCOM_BOARD_PLATFORMS += msm7630_fusion
+QCOM_BOARD_PLATFORMS += msm8226
+QCOM_BOARD_PLATFORMS += msm8660
+QCOM_BOARD_PLATFORMS += msm8909
+QCOM_BOARD_PLATFORMS += msm8916
+QCOM_BOARD_PLATFORMS += msm8939
+QCOM_BOARD_PLATFORMS += msm8937
+QCOM_BOARD_PLATFORMS += msm8952
+QCOM_BOARD_PLATFORMS += msm8953
+QCOM_BOARD_PLATFORMS += msm8960
+QCOM_BOARD_PLATFORMS += msm8974
+QCOM_BOARD_PLATFORMS += msm8992
+QCOM_BOARD_PLATFORMS += msm8994
+QCOM_BOARD_PLATFORMS += msm8996
+QCOM_BOARD_PLATFORMS += msm8998
+QCOM_BOARD_PLATFORMS += apq8084
+QCOM_BOARD_PLATFORMS += sdm660
+QCOM_BOARD_PLATFORMS += sdm710
+QCOM_BOARD_PLATFORMS += sdm845
+QCOM_BOARD_PLATFORMS += sm8150
+QCOM_BOARD_PLATFORMS += msmnile
+QCOM_BOARD_PLATFORMS += kona
+QCOM_BOARD_PLATFORMS += sm6150
+QCOM_BOARD_PLATFORMS += sm8250
+QCOM_BOARD_PLATFORMS += lahaina
+QCOM_BOARD_PLATFORMS += sm8350
+QCOM_BOARD_PLATFORMS += taro
+
+MSM7K_BOARD_PLATFORMS := msm7630_surf
+MSM7K_BOARD_PLATFORMS += msm7630_fusion
+MSM7K_BOARD_PLATFORMS += msm7627_surf
+MSM7K_BOARD_PLATFORMS += msm7627_6x
+MSM7K_BOARD_PLATFORMS += msm7627a
+MSM7K_BOARD_PLATFORMS += msm7k
+
+QSD8K_BOARD_PLATFORMS := qsd8k
+
+# Target-specific configuration
+qcom_flags := -DQCOM_HARDWARE
+ifeq ($(TARGET_USES_QCOM_BSP),true)
+ qcom_flags += -DQCOM_BSP
+ qcom_flags += -DQTI_BSP
+endif
+
+PRIVATE_TARGET_GLOBAL_CFLAGS += $(qcom_flags)
+PRIVATE_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)
+
+TARGET_COMPILE_WITH_MSM_KERNEL := true
+MSM_VIDC_TARGET_LIST := \
+ msm8974 \
+ msm8610 \
+ msm8226 \
+ apq8084 \
+ msm8916 \
+ msm8937 \
+ msm8952 \
+ msm8953 \
+ msm8994 \
+ msm8909 \
+ msm8992 \
+ msm8996 \
+ msm8998 \
+ sdm660 \
+ sdm710 \
+ sdm845 \
+ sm8150 \
+ msmnile \
+ sm6150 \
+ kona
+
+# Gralloc Usage Bits
+TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := (1 << 13) | (1 << 21) | (1 << 27)
+
+# Set device-specific HALs into project pathmap
+$(call set-device-specific-path,AUDIO,audio,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/audio)
+$(call set-device-specific-path,DISPLAY,display,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/display)
+$(call set-device-specific-path,MEDIA,media,hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)/media)
+
+$(call set-device-specific-path,BT_VENDOR,bt-vendor,hardware/qcom-caf/bt)
+$(call set-device-specific-path,DATA_IPA_CFG_MGR,data-ipa-cfg-mgr,vendor/qcom/opensource/data-ipa-cfg-mgr)
+$(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource/dataservices)
+$(call set-device-specific-path,VR,vr,hardware/qcom-caf/vr)
+$(call set-device-specific-path,WLAN,wlan,hardware/qcom-caf/wlan)
+
+# Wlan Qcom Guard
+PRODUCT_CFI_INCLUDE_PATHS += \
+ hardware/qcom-caf/wlan/qcwcn/wpa_supplicant_8_lib
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index ce0ad6f..8abc0cb 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -68,11 +68,7 @@
SOONG_CONFIG_omniGlobalVars_target_create_device_symlinks := $(TARGET_CREATE_DEVICE_SYMLINKS)
# Set default values
-ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
-TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS := (1 << 13) | (1 << 21) | (1 << 27)
-else
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
-endif
TARGET_INIT_VENDOR_LIB ?= vendor_init
TARGET_SURFACEFLINGER_UDFPS_LIB ?= surfaceflinger_udfps_lib
TARGET_GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE ?= false