From af783aa91f7a279153fb8bab8d0d6b9f737996e9 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Sun, 2 Mar 2014 19:48:19 -0800 Subject: mediaserver and associated services are 32-bit only also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3 --- cmds/screenrecord/Android.mk | 2 ++ cmds/stagefright/Android.mk | 16 ++++++++++++++++ libvideoeditor/lvpp/Android.mk | 2 ++ libvideoeditor/vss/src/Android.mk | 2 ++ libvideoeditor/vss/stagefrightshells/src/Android.mk | 2 ++ media/libmediaplayerservice/Android.mk | 2 ++ media/libstagefright/Android.mk | 2 ++ media/libstagefright/chromium_http/Android.mk | 2 ++ media/libstagefright/codecs/aacenc/Android.mk | 1 + media/libstagefright/codecs/avc/enc/Android.mk | 2 ++ media/mediaserver/Android.mk | 1 + services/audioflinger/Android.mk | 1 + services/camera/libcameraservice/Android.mk | 1 + services/medialog/Android.mk | 2 ++ 14 files changed, 38 insertions(+) diff --git a/cmds/screenrecord/Android.mk b/cmds/screenrecord/Android.mk index d77fdb6..57a2234 100644 --- a/cmds/screenrecord/Android.mk +++ b/cmds/screenrecord/Android.mk @@ -40,4 +40,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= screenrecord +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index 561ce02..e2e389b 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -23,6 +23,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= stagefright +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) ################################################################################ @@ -46,6 +48,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= record +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) ################################################################################ @@ -69,6 +73,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= recordvideo +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) @@ -93,6 +99,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= audioloop +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) ################################################################################ @@ -116,6 +124,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= stream +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) ################################################################################ @@ -139,6 +149,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= sf2 +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) ################################################################################ @@ -163,6 +175,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= codec +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) ################################################################################ @@ -186,4 +200,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= muxer +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 2286827..f0afbc9 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -100,6 +100,8 @@ LOCAL_CFLAGS += -Wno-multichar \ -DUSE_STAGEFRIGHT_READERS \ -DUSE_STAGEFRIGHT_3GPP_READER +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) #include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index 0caa15b..8856c41 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -96,4 +96,6 @@ LOCAL_CFLAGS += -Wno-multichar \ -DM4xVSS_RESERVED_MOOV_DISK_SPACEno \ -DDECODE_GIF_ON_SAVING +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index e30b85d..c603252 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -65,4 +65,6 @@ LOCAL_MODULE:= libvideoeditor_stagefrightshells LOCAL_MODULE_TAGS := optional +LOCAL_32_BIT_ONLY := true + include $(BUILD_STATIC_LIBRARY) diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 8f21632..85c9464 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -54,6 +54,8 @@ LOCAL_C_INCLUDES := \ LOCAL_MODULE:= libmediaplayerservice +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 6a2a696..4f17ea5 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -122,6 +122,8 @@ LOCAL_MODULE:= libstagefright LOCAL_MODULE_TAGS := optional +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/media/libstagefright/chromium_http/Android.mk b/media/libstagefright/chromium_http/Android.mk index f26f386..25a25ab 100644 --- a/media/libstagefright/chromium_http/Android.mk +++ b/media/libstagefright/chromium_http/Android.mk @@ -33,5 +33,7 @@ LOCAL_MODULE:= libstagefright_chromium_http LOCAL_MODULE_TAGS := optional +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) endif diff --git a/media/libstagefright/codecs/aacenc/Android.mk b/media/libstagefright/codecs/aacenc/Android.mk index 057c69b..35348de 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -113,6 +113,7 @@ ifeq ($(AAC_LIBRARY), fraunhofer) LOCAL_MODULE := libstagefright_soft_aacenc LOCAL_MODULE_TAGS := optional + LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk index 7d17c2a..d4381e4 100644 --- a/media/libstagefright/codecs/avc/enc/Android.mk +++ b/media/libstagefright/codecs/avc/enc/Android.mk @@ -20,6 +20,7 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libstagefright_avcenc +LOCAL_32_BIT_ONLY := true LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ @@ -68,5 +69,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libstagefright_soft_h264enc LOCAL_MODULE_TAGS := optional +LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY) diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index 1ac647a..d07bc99 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -35,5 +35,6 @@ LOCAL_C_INCLUDES := \ frameworks/av/services/camera/libcameraservice LOCAL_MODULE:= mediaserver +LOCAL_32_BIT_ONLY := true include $(BUILD_EXECUTABLE) diff --git a/services/audioflinger/Android.mk b/services/audioflinger/Android.mk index 54377f1..5fcc9ba 100644 --- a/services/audioflinger/Android.mk +++ b/services/audioflinger/Android.mk @@ -52,6 +52,7 @@ LOCAL_STATIC_LIBRARIES := \ libmedia_helper LOCAL_MODULE:= libaudioflinger +LOCAL_32_BIT_ONLY := true LOCAL_SRC_FILES += FastMixer.cpp FastMixerState.cpp AudioWatchdog.cpp diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index 51ba698..4352b17 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -59,5 +59,6 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS += -Wall -Wextra LOCAL_MODULE:= libcameraservice +LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY) diff --git a/services/medialog/Android.mk b/services/medialog/Android.mk index 08006c8..95f2fef 100644 --- a/services/medialog/Android.mk +++ b/services/medialog/Android.mk @@ -8,4 +8,6 @@ LOCAL_SHARED_LIBRARIES := libmedia libbinder libutils liblog libnbaio LOCAL_MODULE:= libmedialogservice +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) -- cgit v1.1