build: Use ifeq/else ifeq/else construction in board config

* Instead of nesting ifeq/else/ifeq/else/endif/endif construction, make
  allows the more readable ifeq/else ifeq/else/endif construction. Use it
  instead.

Change-Id: Ifd2635929799db593e04a13827f05c97e95487e4
This commit is contained in:
Ethan Chen 2019-06-22 19:57:57 -07:00 committed by Bruno Martins
parent 5512b647e0
commit b7b49cc07d
2 changed files with 6 additions and 18 deletions

View file

@ -68,11 +68,9 @@ endif
ifeq ($(KERNEL_TOOLCHAIN),)
KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN_PREFIX)
else
ifneq ($(KERNEL_TOOLCHAIN_PREFIX),)
else ifneq ($(KERNEL_TOOLCHAIN_PREFIX),)
KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN)/$(KERNEL_TOOLCHAIN_PREFIX)
endif
endif
ifneq ($(USE_CCACHE),)
# Detect if the system already has ccache installed to use instead of the prebuilt

View file

@ -58,35 +58,25 @@ 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)
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)
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)
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)
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)
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
PRODUCT_SOONG_NAMESPACES += \
hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT) \