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

Commit 259ace8f authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Merge commit 'c250980f' into manualmerge 

Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
parents 91cea702 c250980f

media/libstagefright/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ LOCAL_MODULE:= libstagefright 


LOCAL_MODULE_TAGS := optional



LOCAL_32_BIT_ONLY := true



include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))

media/libstagefright/codecs/aacenc/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ ifeq ($(AAC_LIBRARY), fraunhofer) 


  LOCAL_MODULE := libstagefright_soft_aacenc

  LOCAL_MODULE_TAGS := optional

  LOCAL_32_BIT_ONLY := true



  include $(BUILD_SHARED_LIBRARY)

media/libstagefright/codecs/avc/enc/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ LOCAL_SRC_FILES := \ 




LOCAL_MODULE := libstagefright_avcenc

LOCAL_32_BIT_ONLY := true



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/src \
@@ -71,7 +70,6 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE := libstagefright_soft_h264enc

LOCAL_MODULE_TAGS := optional

LOCAL_32_BIT_ONLY := true



LOCAL_CFLAGS += -Werror

media/libstagefright/httplive/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -30,6 +30,4 @@ ifeq ($(TARGET_ARCH),arm) 
    LOCAL_CFLAGS += -Wno-psabi

endif



LOCAL_32_BIT_ONLY := true



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/id3/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -29,6 +29,4 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_MODULE := testid3



LOCAL_32_BIT_ONLY := true



include $(BUILD_EXECUTABLE)