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

Commit b9e55c4f authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright." 

* commit 'ca44dc79':
  Add libcrypto for users of libstagefright.
parents 77fc9bbc ca44dc79

media/libmediaplayerservice/Android.mk

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

    libbinder                   \

    libcamera_client            \

    libcrypto                   \

    libcutils                   \

    liblog                      \

    libdl                       \

media/libstagefright/rtsp/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ LOCAL_C_INCLUDES:= \ 


LOCAL_MODULE:= libstagefright_rtsp



LOCAL_WHOLE_STATIC_LIBRARIES := \

	libcrypto_static



ifeq ($(TARGET_ARCH),arm)

    LOCAL_CFLAGS += -Wno-psabi

endif