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

Commit 0327cddd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: enable compilation for lahaina"

parents 8a2bb255 4e64c78e

Android.mk

+1 −1
Original line number Diff line number Diff line 
ifneq ($(AUDIO_USE_STUB_HAL), true)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 sdmshrike msmnile kona $(MSMSTEPPE) $(TRINKET) atoll lito bengal,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 sdmshrike msmnile kona lahaina $(MSMSTEPPE) $(TRINKET) atoll lito bengal,$(TARGET_BOARD_PLATFORM)),)



MY_LOCAL_PATH := $(call my-dir)

audiod/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 


LOCAL_MODULE:= audiod



ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_EXECUTABLE)

hal/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_ARM_MODE := arm 


AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter msm8974 msm8226 msm8084 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 sdmshrike msmnile kona sdm660 msm8937 $(MSMSTEPPE) $(TRINKET) lito atoll bengal,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter msm8974 msm8226 msm8084 msm8610 apq8084 msm8994 msm8992 msm8996 msm8998 apq8098_latv sdm845 sdm710 qcs605 sdmshrike msmnile kona lahaina sdm660 msm8937 $(MSMSTEPPE) $(TRINKET) lito atoll bengal,$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -70,7 +70,7 @@ ifneq ($(filter msmnile sdmshrike,$(TARGET_BOARD_PLATFORM)),) 
  LOCAL_CFLAGS += -DINCALL_MUSIC_ENABLED

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED

endif

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

  LOCAL_CFLAGS := -DPLATFORM_KONA

  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="4"

  LOCAL_CFLAGS += -DINCALL_STEREO_CAPTURE_ENABLED
@@ -379,7 +379,7 @@ LOCAL_MODULE_OWNER := qti 


LOCAL_VENDOR_MODULE := true



ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)

hal/audio_extn/Android.mk

+29 −29
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -67,7 +67,7 @@ LOCAL_VENDOR_MODULE := true 


AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 qcs605 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 qcs605 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -114,7 +114,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -130,7 +130,7 @@ LOCAL_VENDOR_MODULE := true 


AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -180,7 +180,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -197,7 +197,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

endif
@@ -243,7 +243,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -253,7 +253,7 @@ include $(BUILD_SHARED_LIBRARY) 
#--------------------------------------------

include $(CLEAR_VARS)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

endif
@@ -302,7 +302,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -312,7 +312,7 @@ include $(BUILD_SHARED_LIBRARY) 


include $(CLEAR_VARS)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

endif
@@ -361,7 +361,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -377,7 +377,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -424,7 +424,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -442,7 +442,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -489,7 +489,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -505,7 +505,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -557,7 +557,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -573,7 +573,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -624,7 +624,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -640,7 +640,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -697,7 +697,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -713,7 +713,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito bengal atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -760,7 +760,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

#include $(BUILD_SHARED_LIBRARY)
@@ -776,7 +776,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona sdm660 msm8937 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina sdm660 msm8937 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -823,7 +823,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -838,7 +838,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona sdm660 msm8937 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina sdm660 msm8937 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM = msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -885,7 +885,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)
@@ -903,7 +903,7 @@ LOCAL_VENDOR_MODULE := true 
PRIMARY_HAL_PATH := vendor/qcom/opensource/audio-hal/primary-hal/hal

AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)



ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter sdm845 sdm710 sdmshrike msmnile kona lahaina lito atoll sdm660 msm8937 msm8998 $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)

  # B-family platform uses msm8974 code base

  AUDIO_PLATFORM := msm8974

  MULTIPLE_HW_VARIANTS_ENABLED := true
@@ -948,7 +948,7 @@ endif 


LOCAL_HEADER_LIBRARIES += libhardware_headers

LOCAL_HEADER_LIBRARIES += libsystem_headers

ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_SHARED_LIBRARY)

hdmi_in_test/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_CPPFLAGS += --coverage -fprofile-arcs -ftest-coverage 
LOCAL_STATIC_LIBRARIES += libprofile_rt

endif



ifneq ($(filter kona,$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter kona lahaina,$(TARGET_BOARD_PLATFORM)),)

LOCAL_SANITIZE := integer_overflow

endif

include $(BUILD_EXECUTABLE)