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

Commit 665e1367 authored by Ethan Chen's avatar Ethan Chen
Browse files

Revert "msm8909 uses the same branches as msm8916" 

* Swap this implementation out for the existing custom HAL variant
  patch.

This reverts commit 4ad24856.

Change-Id: I959b958098deb976c06597c82d3d532e3b80546d
parent 4ad24856

core/qcom_target.mk

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

    2ND_CLANG_TARGET_GLOBAL_CFLAGS += $(qcom_flags)

    2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)

    2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(qcom_flags)





TARGET_BOARD_PLATFORM_GENERIC := $(TARGET_BOARD_PLATFORM)

$(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(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)

ifeq ($(USE_DEVICE_SPECIFIC_CAMERA),true)

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

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

else

else

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

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

endif

endif

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

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

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

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

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

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

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

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

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

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

$(call loc-api-set-path-variant,vendor/qcom/opensource/location)

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

else

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

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

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

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

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

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

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

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

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

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

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

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