diff options
Diffstat (limited to 'core/qcom_target.mk')
| -rw-r--r-- | core/qcom_target.mk | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 092d832..9b8d6bb 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -27,12 +27,14 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) qcom_flags += -DQCOM_BSP qcom_flags += -DQTI_BSP + BOARD_USES_ADRENO := true + TARGET_USES_QCOM_BSP := true # Tell HALs that we're compiling an AOSP build with an in-line kernel TARGET_COMPILE_WITH_MSM_KERNEL := true - ifneq ($(filter msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm7x27a msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),) # Enable legacy graphics functions qcom_flags += -DQCOM_BSP_LEGACY # Enable legacy audio functions @@ -60,6 +62,9 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) ifneq ($(filter msm8909 msm8916,$(TARGET_BOARD_PLATFORM)),) QCOM_HARDWARE_VARIANT := msm8916 else + ifneq ($(filter msm8953 msm8937,$(TARGET_BOARD_PLATFORM)),) + QCOM_HARDWARE_VARIANT := msm8937 + else ifneq ($(filter msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) QCOM_HARDWARE_VARIANT := msm8994 else @@ -67,17 +72,27 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) endif endif endif + endif endif -$(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT)) - -ifeq ($(SONY_BF64_KERNEL_VARIANT),true) -$(call project-set-path,qcom-display,hardware/qcom/display-caf/sony) -$(call project-set-path,qcom-media,hardware/qcom/media-caf/sony) +# HACK: check to see if build uses standard QC HAL paths by checking for CM path structure +AOSP_VARIANT_MAKEFILE := $(wildcard hardware/qcom/audio/default/Android.mk) +ifeq ("$(AOSP_VARIANT_MAKEFILE)","") +$(call project-set-path,qcom-audio,hardware/qcom/audio) +$(call project-set-path,qcom-display,hardware/qcom/display) +$(call project-set-path,qcom-media,hardware/qcom/media) +$(call set-device-specific-path,CAMERA,camera,hardware/qcom/camera) +$(call set-device-specific-path,GPS,gps,hardware/qcom/gps) +$(call set-device-specific-path,SENSORS,sensors,hardware/qcom/sensors) +$(call set-device-specific-path,LOC_API,loc-api,vendor/qcom/opensource/location) +$(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource/dataservices) +$(call project-set-path,ril,hardware/ril) +$(call project-set-path,wlan,hardware/qcom/wlan) +$(call project-set-path,bt-vendor,hardware/qcom/bt) else +$(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT)) $(call project-set-path,qcom-display,hardware/qcom/display-caf/$(QCOM_HARDWARE_VARIANT)) $(call project-set-path,qcom-media,hardware/qcom/media-caf/$(QCOM_HARDWARE_VARIANT)) -endif $(call set-device-specific-path,CAMERA,camera,hardware/qcom/camera) $(call set-device-specific-path,GPS,gps,hardware/qcom/gps) @@ -88,6 +103,7 @@ $(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource $(call ril-set-path-variant,ril) $(call wlan-set-path-variant,wlan-caf) $(call bt-vendor-set-path-variant,bt-caf) +endif # AOSP_VARIANT_MAKEFILE else |