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

Commit 10761b69 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm-audio: Fix Security Issues"

parents 438932f5 10aefdac

mm-audio/aenc-aac/qdsp6/Android.mk

+23 −0
Original line number Diff line number Diff line
@@ -42,6 +42,29 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 


include $(BUILD_SHARED_LIBRARY)



# ---------------------------------------------------------------------------------

#             Make the apps-test (mm-aenc-omxaac-test)

# ---------------------------------------------------------------------------------



include $(CLEAR_VARS)



mm-aac-enc-test-inc    := $(LOCAL_PATH)/inc

mm-aac-enc-test-inc    += $(LOCAL_PATH)/test

mm-aac-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa

mm-aac-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-core/omxcore



LOCAL_MODULE            := mm-aenc-omxaac-test

LOCAL_MODULE_TAGS       := optional

LOCAL_CFLAGS            := $(libOmxAacEnc-def)

LOCAL_C_INCLUDES        := $(mm-aac-enc-test-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libmm-omxcore

LOCAL_SHARED_LIBRARIES  += libOmxAacEnc

LOCAL_SHARED_LIBRARIES  += libaudioalsa

LOCAL_SRC_FILES         := test/omx_aac_enc_test.c



include $(BUILD_EXECUTABLE)



endif



# ---------------------------------------------------------------------------------

mm-audio/aenc-aac/qdsp6/Makefile

+15 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ BININSTALLDIR := $(DESTDIR)usr/bin 
# ---------------------------------------------------------------------------------

#					BUILD

# ---------------------------------------------------------------------------------

all: libOmxAacEnc.so.$(LIBVER)

all: libOmxAacEnc.so.$(LIBVER) mm-aenc-omxaac-test



install:

	echo "intalling aenc-aac in $(DESTDIR)"
@@ -49,6 +49,7 @@ install: 
	install -m 555 libOmxAacEnc.so.$(LIBVER) $(LIBINSTALLDIR)

	cd $(LIBINSTALLDIR) && ln -s libOmxAacEnc.so.$(LIBVER) libOmxAacEnc.so.$(LIBMAJOR)

	cd $(LIBINSTALLDIR) && ln -s libOmxAacEnc.so.$(LIBMAJOR) libOmxAacEnc.so

	install -m 555 mm-aenc-omxaac-test $(BININSTALLDIR)

	

# ---------------------------------------------------------------------------------

#				COMPILE LIBRARY
@@ -63,6 +64,18 @@ SRCS += src/aenc_svr.c 
libOmxAacEnc.so.$(LIBVER): $(SRCS)

	$(CC) $(CPPFLAGS) $(CFLAGS_SO) $(LDFLAGS_SO) -Wl,-soname,libOmxAacEnc.so.$(LIBMAJOR) -o $@ $^ $(LDFLAGS) $(LDLIBS)



# ---------------------------------------------------------------------------------

#				COMPILE TEST APP

# ---------------------------------------------------------------------------------

TEST_LDLIBS := -lpthread

TEST_LDLIBS += -ldl

TEST_LDLIBS += -lOmxCore



TEST_SRCS := test/omx_aac_enc_test.c



mm-aenc-omxaac-test: libOmxAacEnc.so.$(LIBVER) $(TEST_SRCS)

	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)



# ---------------------------------------------------------------------------------

#					END

# ---------------------------------------------------------------------------------

mm-audio/aenc-aac/qdsp6/Makefile.am

+5 −0
Original line number Diff line number Diff line
@@ -26,3 +26,8 @@ libOmxAacEnc_la_CFLAGS = $(AM_CFLAGS) -fPIC $(GLIB_CFLAGS) -include glib.h -Dstr 
libOmxAacEnc_la_CPPFLAGS = $(AM_CPPFLAGS) -fPIC $(GLIB_CFLAGS) -include glib.h -Dstrlcpy=g_strlcpy

libOmxAacEnc_la_LIBADD = -lmm-omxcore -lstdc++ -lpthread $(GLIB_LIBS) -ldl -llog

libOmxAacEnc_la_LDFLAGS = -shared $(GLIB_LIBS) -avoid-version $(OMXAUDIO_LIBRARY_VERSION)



bin_PROGRAMS = mm-aenc-omxaac-test

mm_aenc_omxaac_test_SOURCES = ./test/omx_aac_enc_test.c

mm_aenc_omxaac_test_CFLAGS = -include errno.h -include limits.h

mm_aenc_omxaac_test_LDADD = -lmm-omxcore -ldl -lpthread -llog libOmxAacEnc.la

mm-audio/aenc-aac/qdsp6/test/omx_aac_enc_test.c

0 → 100644
+1367 −0

File added.

Preview size limit exceeded, changes collapsed.

mm-audio/aenc-amrnb/qdsp6/Android.mk

+23 −0
Original line number Diff line number Diff line
@@ -42,6 +42,29 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr 


include $(BUILD_SHARED_LIBRARY)



# ---------------------------------------------------------------------------------

#             Make the apps-test (mm-aenc-omxamr-test)

# ---------------------------------------------------------------------------------



include $(CLEAR_VARS)



mm-amr-enc-test-inc    := $(LOCAL_PATH)/inc

mm-amr-enc-test-inc    += $(LOCAL_PATH)/test



mm-amr-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-core/omxcore

mm-amr-enc-test-inc    += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa

LOCAL_MODULE            := mm-aenc-omxamr-test

LOCAL_MODULE_TAGS       := optional

LOCAL_CFLAGS            := $(libOmxAmrEnc-def)

LOCAL_C_INCLUDES        := $(mm-amr-enc-test-inc)

LOCAL_PRELINK_MODULE    := false

LOCAL_SHARED_LIBRARIES  := libmm-omxcore

LOCAL_SHARED_LIBRARIES  += libOmxAmrEnc

LOCAL_SHARED_LIBRARIES  += libaudioalsa

LOCAL_SRC_FILES         := test/omx_amr_enc_test.c



include $(BUILD_EXECUTABLE)



endif



# ---------------------------------------------------------------------------------