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

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

Merge "Add libmedia_native"

parents 748601bc ae75f994

cmds/stagefright/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \ 
	SineSource.cpp



LOCAL_SHARED_LIBRARIES := \

	libstagefright libmedia libutils libbinder libstagefright_foundation \

	libstagefright libmedia libmedia_native libutils libbinder libstagefright_foundation \

        libskia libgui



LOCAL_C_INCLUDES:= \
@@ -108,7 +108,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libgui \

        libstagefright_foundation libmedia

        libstagefright_foundation libmedia libmedia_native



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \
@@ -132,7 +132,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

        libmedia libgui libcutils libui

        libmedia libmedia_native libgui libcutils libui



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \
@@ -157,7 +157,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

        libmedia libgui libcutils libui

        libmedia libmedia_native libgui libcutils libui



LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libicuuc \

	libicui18n \

	libmedia \

	libmedia_native \

	libwpa_client \

	libjpeg \

	libusbhost \

media/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils \

    libbinder \

    libmedia \

    libmedia_native \

    libskia \

    libui \

    libcutils \

media/jni/audioeffect/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ LOCAL_SHARED_LIBRARIES := \ 
	libutils \

	libandroid_runtime \

	libnativehelper \

	libmedia

	libmedia \

	libmedia_native



LOCAL_C_INCLUDES := \

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

media/jni/soundpool/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ LOCAL_SHARED_LIBRARIES := \ 
	libbinder \

	libandroid_runtime \

	libnativehelper \

	libmedia

	libmedia \

	libmedia_native



LOCAL_MODULE:= libsoundpool