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

Commit 4513bc0f authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Remove dependency on audio_* location"

parents 5571ffdd 4e42c5f4

media/jni/audioeffect/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libmedia



LOCAL_C_INCLUDES := \

	system/media/audio_effects/include

	$(call include-path-for, audio-effects)



LOCAL_MODULE:= libaudioeffect_jni

media/libeffects/downmix/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ LOCAL_LDLIBS += -ldl 
endif



LOCAL_C_INCLUDES := \

	system/media/audio_effects/include \

	system/media/audio_utils/include

	$(call include-path-for, audio-effects) \

	$(call include-path-for, audio-utils)



LOCAL_PRELINK_MODULE := false

media/libeffects/factory/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ LOCAL_MODULE:= libeffects 
LOCAL_SHARED_LIBRARIES += libdl



LOCAL_C_INCLUDES := \

    system/media/audio_effects/include

    $(call include-path-for, audio-effects)



include $(BUILD_SHARED_LIBRARY)

media/libeffects/lvm/wrapper/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ LOCAL_C_INCLUDES += \ 
	$(LOCAL_PATH)/Bundle \

	$(LOCAL_PATH)/../lib/Common/lib/ \

	$(LOCAL_PATH)/../lib/Bundle/lib/ \

	system/media/audio_effects/include

	$(call include-path-for, audio-effects)





include $(BUILD_SHARED_LIBRARY)
@@ -55,6 +55,6 @@ LOCAL_C_INCLUDES += \ 
    $(LOCAL_PATH)/Reverb \

    $(LOCAL_PATH)/../lib/Common/lib/ \

    $(LOCAL_PATH)/../lib/Reverb/lib/ \

    system/media/audio_effects/include

    $(call include-path-for, audio-effects)



include $(BUILD_SHARED_LIBRARY)

media/libeffects/preprocessing/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LOCAL_C_INCLUDES += \ 
    external/webrtc/src \

    external/webrtc/src/modules/interface \

    external/webrtc/src/modules/audio_processing/interface \

    system/media/audio_effects/include

    $(call include-path-for, audio-effects)



LOCAL_C_INCLUDES += $(call include-path-for, speex)