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

Commit 50dfb965 authored by Tom Marshall's avatar Tom Marshall
Browse files

fw/av: Use project pathmap 

Change-Id: I4c2753c663613094da6c2082e72d67e3af0e0ab9
parent 129f5b1d

media/libmediaplayerservice/Android.mk

+3 −13
Original line number Diff line number Diff line
@@ -54,13 +54,8 @@ LOCAL_C_INCLUDES := \ 
    $(TOP)/external/tremolo/Tremolo                                 \



ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

    ifneq ($(TARGET_QCOM_MEDIA_VARIANT),)

    LOCAL_C_INCLUDES += \

            $(TOP)/hardware/qcom/media-$(TARGET_QCOM_MEDIA_VARIANT)/mm-core/inc

    else

    LOCAL_C_INCLUDES += \

            $(TOP)/hardware/qcom/media/mm-core/inc

    endif

        $(call project-path-for,qcom-media)/mm-core/inc

endif



LOCAL_MODULE:= libmediaplayerservice
@@ -68,13 +63,8 @@ LOCAL_MODULE:= libmediaplayerservice 
ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true)

    LOCAL_CFLAGS += -DENABLE_AV_ENHANCEMENTS

    LOCAL_C_INCLUDES += $(TOP)/frameworks/av/include/media

    ifneq ($(TARGET_QCOM_MEDIA_VARIANT),)

    LOCAL_C_INCLUDES += \

            $(TOP)/hardware/qcom/media-$(TARGET_QCOM_MEDIA_VARIANT)/mm-core/inc

    else

        LOCAL_C_INCLUDES += \

            $(TOP)/hardware/qcom/media/mm-core/inc

    endif

        $(call project-path-for,qcom-media)/mm-core/inc

endif #TARGET_ENABLE_QC_AV_ENHANCEMENTS



ifeq ($(TARGET_BOARD_PLATFORM),msm7x27a)

media/libstagefright/Android.mk

+3 −13
Original line number Diff line number Diff line
@@ -119,16 +119,11 @@ ifneq ($(filter caf bfam,$(TARGET_QCOM_AUDIO_VARIANT)),) 
    endif

endif



ifneq ($(TARGET_QCOM_MEDIA_VARIANT),)

LOCAL_C_INCLUDES += \

        $(TOP)/hardware/qcom/media-$(TARGET_QCOM_MEDIA_VARIANT)/mm-core/inc

    $(call project-path-for,qcom-media)/mm-core/inc

ifneq ($(TARGET_QCOM_MEDIA_VARIANT),caf-new)

    LOCAL_CFLAGS += -DLEGACY_MEDIA

endif

else

LOCAL_C_INCLUDES += \

        $(TOP)/hardware/qcom/media/mm-core/inc

endif



LOCAL_SHARED_LIBRARIES := \

        libbinder \
@@ -175,13 +170,8 @@ ifeq ($(TARGET_ENABLE_QC_AV_ENHANCEMENTS),true) 
    LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include

    LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr



    ifneq ($(TARGET_QCOM_MEDIA_VARIANT),)

    LOCAL_C_INCLUDES += \

            $(TOP)/hardware/qcom/media-$(TARGET_QCOM_MEDIA_VARIANT)/mm-core/inc

    else

        LOCAL_C_INCLUDES += \

            $(TOP)/hardware/qcom/media/mm-core/inc

    endif

        $(call project-path-for,qcom-media)/mm-core/inc



else #TARGET_ENABLE_AV_ENHANCEMENTS

ifeq ($(TARGET_ENABLE_OFFLOAD_ENHANCEMENTS),true)