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

Commit cf79c7a5 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 02483465: am 1d2909b3: Merge "Remove unused LOCAL_LDLIBS."

* commit '02483465':
  Remove unused LOCAL_LDLIBS.
parents 71171988 02483465
Loading
Loading
Loading
Loading
+0 −4
Original line number Original line Diff line number Diff line
@@ -85,10 +85,6 @@ LOCAL_C_INCLUDES += \


LOCAL_SHARED_LIBRARIES += libdl
LOCAL_SHARED_LIBRARIES += libdl


# All of the shared libraries we link against.
LOCAL_LDLIBS := \
    -lpthread -ldl

LOCAL_CFLAGS += -Wno-multichar \
LOCAL_CFLAGS += -Wno-multichar \
     -DM4_ENABLE_RENDERINGMODE \
     -DM4_ENABLE_RENDERINGMODE \
    -DUSE_STAGEFRIGHT_CODECS \
    -DUSE_STAGEFRIGHT_CODECS \
+0 −4
Original line number Original line Diff line number Diff line
@@ -48,10 +48,6 @@ LOCAL_C_INCLUDES += \


LOCAL_SHARED_LIBRARIES += libdl
LOCAL_SHARED_LIBRARIES += libdl


# All of the shared libraries we link against.
LOCAL_LDLIBS := \
    -lpthread -ldl

LOCAL_CFLAGS += -Wno-multichar \
LOCAL_CFLAGS += -Wno-multichar \
    -D__ANDROID__ \
    -D__ANDROID__ \
    -DM4OSA_FILE_BLOCK_WITH_SEMAPHORE \
    -DM4OSA_FILE_BLOCK_WITH_SEMAPHORE \
+0 −5
Original line number Original line Diff line number Diff line
@@ -43,12 +43,7 @@ LOCAL_C_INCLUDES += \


LOCAL_SHARED_LIBRARIES += libdl
LOCAL_SHARED_LIBRARIES += libdl


# All of the shared libraries we link against.
LOCAL_LDLIBS := \
    -lpthread -ldl

LOCAL_CFLAGS += -Wno-multichar \
LOCAL_CFLAGS += -Wno-multichar \
    -DDUPLICATE_STTS_IN_LAST_AU
    -DDUPLICATE_STTS_IN_LAST_AU


include $(BUILD_STATIC_LIBRARY)
include $(BUILD_STATIC_LIBRARY)
+0 −5
Original line number Original line Diff line number Diff line
@@ -47,12 +47,7 @@ LOCAL_C_INCLUDES += \


LOCAL_SHARED_LIBRARIES += libdl
LOCAL_SHARED_LIBRARIES += libdl


# All of the shared libraries we link against.
LOCAL_LDLIBS := \
    -lpthread -ldl

LOCAL_CFLAGS += -Wno-multichar \
LOCAL_CFLAGS += -Wno-multichar \
    -DM4MCS_WITH_FAST_OPEN
    -DM4MCS_WITH_FAST_OPEN


include $(BUILD_STATIC_LIBRARY)
include $(BUILD_STATIC_LIBRARY)
+0 −4
Original line number Original line Diff line number Diff line
@@ -87,10 +87,6 @@ LOCAL_C_INCLUDES += \


LOCAL_SHARED_LIBRARIES += libdl
LOCAL_SHARED_LIBRARIES += libdl


# All of the shared libraries we link against.
LOCAL_LDLIBS := \
    -lpthread -ldl

LOCAL_CFLAGS += -Wno-multichar \
LOCAL_CFLAGS += -Wno-multichar \
    -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \
    -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \
    -DDECODE_GIF_ON_SAVING
    -DDECODE_GIF_ON_SAVING
Loading