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

Commit 8d6d8f54 authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Add libcrypto for users of libstagefright."

parents d3af4265 7dc5bfcf

media/libmediaplayerservice/Android.mk

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

LOCAL_SHARED_LIBRARIES :=       \

    libbinder                   \

    libbinder                   \

    libcamera_client            \

    libcamera_client            \

    libcrypto                   \

    libcutils                   \

    libcutils                   \

    liblog                      \

    liblog                      \

    libdl                       \

    libdl                       \

media/libstagefright/rtsp/Android.mk

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




LOCAL_MODULE:= libstagefright_rtsp

LOCAL_MODULE:= libstagefright_rtsp





LOCAL_WHOLE_STATIC_LIBRARIES := \

	libcrypto_static



ifeq ($(TARGET_ARCH),arm)

ifeq ($(TARGET_ARCH),arm)

    LOCAL_CFLAGS += -Wno-psabi

    LOCAL_CFLAGS += -Wno-psabi

endif

endif