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

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

Merge "Add libmedia_native"

parents 1746929d b12153e3

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) \

media/libaah_rtp/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcommon_time_client \

    libbinder \

    libmedia \

    libmedia_native \

    libstagefright \

    libstagefright_foundation \

    libutils
@@ -37,4 +38,3 @@ LOCAL_LDLIBS := \ 
    -lpthread



include $(BUILD_SHARED_LIBRARY)

media/libmedia/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ LOCAL_SRC_FILES:= \ 
LOCAL_SHARED_LIBRARIES := \

	libui libcutils libutils libbinder libsonivox libicuuc libexpat \

        libcamera_client libstagefright_foundation \

        libgui libdl libaudioutils

        libgui libdl libaudioutils libmedia_native



LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper

media/libmediaplayerservice/Android.mk

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

	libsonivox            			\

	libmedia              			\

	libmedia_native       			\

	libcamera_client      			\

	libandroid_runtime    			\

	libstagefright        			\

media/libstagefright/Android.mk

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

        liblog \

        libmedia \

        libmedia_native \

        libsonivox \

        libssl \

        libstagefright_omx \