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

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

Merge "Remove obsolete references to libmedia_native"

parents 670d4b75 c4159025
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \
	SineSource.cpp

LOCAL_SHARED_LIBRARIES := \
	libstagefright libmedia libmedia_native libutils libbinder libstagefright_foundation \
	libstagefright libmedia libutils libbinder libstagefright_foundation \
        libjpeg libgui

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

LOCAL_SHARED_LIBRARIES := \
	libstagefright liblog libutils libbinder libgui \
        libstagefright_foundation libmedia libmedia_native libcutils
        libstagefright_foundation libmedia libcutils

LOCAL_C_INCLUDES:= \
	frameworks/av/media/libstagefright \
@@ -127,7 +127,7 @@ LOCAL_SRC_FILES:= \

LOCAL_SHARED_LIBRARIES := \
	libstagefright liblog libutils libbinder libstagefright_foundation \
        libmedia libmedia_native libgui libcutils libui
        libmedia libgui libcutils libui

LOCAL_C_INCLUDES:= \
	frameworks/av/media/libstagefright \
@@ -151,7 +151,7 @@ LOCAL_SRC_FILES:= \

LOCAL_SHARED_LIBRARIES := \
	libstagefright liblog libutils libbinder libstagefright_foundation \
        libmedia libmedia_native libgui libcutils libui
        libmedia libgui libcutils libui

LOCAL_C_INCLUDES:= \
	frameworks/av/media/libstagefright \
+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ LOCAL_SHARED_LIBRARIES := \
    libGLESv2                 \
    libgui                    \
    libmedia                  \
    libmedia_native           \
    libdrmframework           \
    libstagefright            \
    libstagefright_foundation \
+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
	libui libcutils libutils libbinder libsonivox libicuuc libexpat \
        libcamera_client libstagefright_foundation \
        libgui libdl libaudioutils libmedia_native
        libgui libdl libaudioutils

LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ LOCAL_SHARED_LIBRARIES := \
    libdl                       \
    libgui                      \
    libmedia                    \
    libmedia_native             \
    libsonivox                  \
    libstagefright              \
    libstagefright_foundation   \
+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ LOCAL_SHARED_LIBRARIES := \
        libicuuc \
        liblog \
        libmedia \
        libmedia_native \
        libsonivox \
        libssl \
        libstagefright_omx \
Loading