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

Commit bd7bde79 authored by Glenn Kasten's avatar Glenn Kasten Committed by Gerrit Code Review
Browse files

Merge "Use libaudioresampler instead of libaudioflinger"

parents 36817364 4269fc80

libvideoeditor/lvpp/Android.mk

+1 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ LOCAL_STATIC_LIBRARIES := \ 




LOCAL_SHARED_LIBRARIES :=     \

    libaudioflinger           \

    libaudioresampler         \

    libaudioutils             \

    libbinder                 \

    libcutils                 \
@@ -81,7 +81,6 @@ LOCAL_C_INCLUDES += \ 
    $(TOP)/frameworks/av/services/audioflinger \

    $(TOP)/frameworks/native/include/media/editor \

    $(TOP)/frameworks/native/include/media/openmax \

    $(TOP)/frameworks/native/services/audioflinger





LOCAL_SHARED_LIBRARIES += libdl
@@ -100,8 +99,6 @@ LOCAL_CFLAGS += -Wno-multichar \ 
    -DUSE_STAGEFRIGHT_READERS \

    -DUSE_STAGEFRIGHT_3GPP_READER



LOCAL_32_BIT_ONLY := true



include $(BUILD_SHARED_LIBRARY)



#include $(call all-makefiles-under,$(LOCAL_PATH))

libvideoeditor/vss/src/Android.mk

+1 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ LOCAL_SRC_FILES:= \ 
LOCAL_MODULE_TAGS := optional



LOCAL_SHARED_LIBRARIES :=       \

    libaudioflinger             \

    libaudioresampler           \

    libaudioutils               \

    libbinder                   \

    libcutils                   \
@@ -81,7 +81,6 @@ LOCAL_C_INCLUDES += \ 
    $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \

    $(TOP)/frameworks/av/services/audioflinger \

    $(TOP)/frameworks/native/include/media/openmax \

    $(TOP)/frameworks/native/services/audioflinger \

    $(TOP)/system/media/audio_effects/include \

    $(TOP)/system/media/audio_utils/include
@@ -96,6 +95,4 @@ LOCAL_CFLAGS += -Wno-multichar \ 
    -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \

    -DDECODE_GIF_ON_SAVING



LOCAL_32_BIT_ONLY := true



include $(BUILD_SHARED_LIBRARY)

libvideoeditor/vss/src/VideoEditorResampler.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_NDEBUG 1

#include <audio_utils/primitives.h>

#include <utils/Log.h>

#include "AudioMixer.h"

#include "AudioResampler.h"

#include "VideoEditorResampler.h"



namespace android {

libvideoeditor/vss/stagefrightshells/src/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -65,6 +65,4 @@ LOCAL_MODULE:= libvideoeditor_stagefrightshells 


LOCAL_MODULE_TAGS := optional



LOCAL_32_BIT_ONLY := true



include $(BUILD_STATIC_LIBRARY)