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

Commit c250980f authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 24e1bd71: Merge "libstagefright is no longer 32 bit only." 

* commit '24e1bd71':
  libstagefright is no longer 32 bit only.
parents 08298357 24e1bd71

media/libstagefright/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,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/chromium_http/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -34,7 +34,5 @@ LOCAL_MODULE:= libstagefright_chromium_http 


LOCAL_MODULE_TAGS := optional



LOCAL_32_BIT_ONLY := true



include $(BUILD_SHARED_LIBRARY)

endif

media/libstagefright/codecs/aacenc/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,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 \
@@ -69,6 +68,5 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_MODULE := libstagefright_soft_h264enc

LOCAL_MODULE_TAGS := optional

LOCAL_32_BIT_ONLY := true



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/httplive/Android.mk

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

endif



LOCAL_32_BIT_ONLY := true



include $(BUILD_SHARED_LIBRARY)