Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad24856 authored by Marcos Marado's avatar Marcos Marado
Browse files

msm8909 uses the same branches as msm8916 

Instead of have duplicated branches, I'm creating here the concept of
"generic platform".
For now, only msm8909 is affected by this (its generic platform being
msm8916), but this might be useful in the future, where other
platforms share the same branch.

Change-Id: Ib410bc644373e6acfab5ad449584171b948743ae
parent e7031998

core/qcom_target.mk

+9 −4
Original line number Diff line number Diff line
@@ -47,15 +47,20 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) 
    2ND_CLANG_TARGET_GLOBAL_CFLAGS += $(qcom_flags)

    2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)



$(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(TARGET_BOARD_PLATFORM))

TARGET_BOARD_PLATFORM_GENERIC := $(TARGET_BOARD_PLATFORM)

ifneq ($(filter msm8909,$(TARGET_BOARD_PLATFORM)),)

    TARGET_BOARD_PLATFORM_GENERIC := msm8916

endif



$(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(TARGET_BOARD_PLATFORM_GENERIC))

ifeq ($(USE_DEVICE_SPECIFIC_CAMERA),true)

$(call project-set-path,qcom-camera,$(TARGET_DEVICE_DIR)/camera)

else

$(call qcom-set-path-variant,CAMERA,camera)

endif

$(call project-set-path,qcom-display,hardware/qcom/display-caf/$(TARGET_BOARD_PLATFORM))

$(call project-set-path,qcom-display,hardware/qcom/display-caf/$(TARGET_BOARD_PLATFORM_GENERIC))

$(call qcom-set-path-variant,GPS,gps)

$(call project-set-path,qcom-media,hardware/qcom/media-caf/$(TARGET_BOARD_PLATFORM))

$(call project-set-path,qcom-media,hardware/qcom/media-caf/$(TARGET_BOARD_PLATFORM_GENERIC))

$(call qcom-set-path-variant,SENSORS,sensors)

$(call ril-set-path-variant,ril)

$(call loc-api-set-path-variant,vendor/qcom/opensource/location)
@@ -63,7 +68,7 @@ $(call gps-hal-set-path-variant,hardware/qcom/gps) 
else

$(call project-set-path,qcom-audio,hardware/qcom/audio/default)

$(call qcom-set-path-variant,CAMERA,camera)

$(call project-set-path,qcom-display,hardware/qcom/display/$(TARGET_BOARD_PLATFORM))

$(call project-set-path,qcom-display,hardware/qcom/display/$(TARGET_BOARD_PLATFORM_GENERIC))

$(call qcom-set-path-variant,GPS,gps)

$(call project-set-path,qcom-media,hardware/qcom/media/default)

$(call qcom-set-path-variant,SENSORS,sensors)