summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/qcom_target.mk32
1 files changed, 19 insertions, 13 deletions
diff --git a/core/qcom_target.mk b/core/qcom_target.mk
index ea91257..a6b572a 100644
--- a/core/qcom_target.mk
+++ b/core/qcom_target.mk
@@ -1,5 +1,10 @@
# Target-specific configuration
+# Populate the qcom hardware variants in the project pathmap.
+define qcom-set-path-variant
+$(call project-set-path-variant,qcom-$(2),TARGET_QCOM_$(1)_VARIANT,hardware/qcom/$(2))
+endef
+
# Enable DirectTrack on QCOM legacy boards
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
@@ -12,21 +17,22 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
endif
# Enable DirectTrack for legacy targets
- ifneq ($(filter caf bfam,$(TARGET_QCOM_AUDIO_VARIANT)),)
- ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
- TARGET_GLOBAL_CFLAGS += -DQCOM_DIRECTTRACK
- TARGET_GLOBAL_CPPFLAGS += -DQCOM_DIRECTTRACK
- endif
+ ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true)
+ TARGET_GLOBAL_CFLAGS += -DQCOM_DIRECTTRACK
+ TARGET_GLOBAL_CPPFLAGS += -DQCOM_DIRECTTRACK
endif
-endif
-# Populate the qcom hardware variants in the project pathmap.
-define qcom-set-path-variant
-$(call project-set-path-variant,qcom-$(2),TARGET_QCOM_$(1)_VARIANT,hardware/qcom/$(2))
-endef
-$(call qcom-set-path-variant,AUDIO,audio)
+$(call project-set-path,qcom-audio,hardware/qcom/audio-caf)
$(call qcom-set-path-variant,CAMERA,camera)
-$(call qcom-set-path-variant,DISPLAY,display)
+$(call project-set-path,qcom-display,hardware/qcom/display-caf)
$(call qcom-set-path-variant,GPS,gps)
-$(call qcom-set-path-variant,MEDIA,media)
+$(call project-set-path,qcom-media,hardware/qcom/media-caf)
$(call qcom-set-path-variant,SENSORS,sensors)
+else
+$(call project-set-path,qcom-audio,hardware/qcom/audio)
+$(call qcom-set-path-variant,CAMERA,camera)
+$(call project-set-path,qcom-display,hardware/qcom/display)
+$(call qcom-set-path-variant,GPS,gps)
+$(call project-set-path,qcom-media,hardware/qcom/media)
+$(call qcom-set-path-variant,SENSORS,sensors)
+endif