diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-14 20:53:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 20:53:30 +0000 |
| commit | 236104afb2300b7d969b1dc786f14b5f912df1cf (patch) | |
| tree | d8b9d1ea56541d1c7a9cdc7e7f4eeea86f1b30bd /media/libstagefright | |
| parent | f10b9885462bea2f0c683038d6833ee230ad9eb2 (diff) | |
| parent | 089affb6c2d9ed1e2d49df4be02d30dc490506f9 (diff) | |
| download | frameworks_av-236104afb2300b7d969b1dc786f14b5f912df1cf.zip frameworks_av-236104afb2300b7d969b1dc786f14b5f912df1cf.tar.gz frameworks_av-236104afb2300b7d969b1dc786f14b5f912df1cf.tar.bz2 | |
am 089affb6: Merge "mediaserver and associated services are 32-bit only"
* commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9':
mediaserver and associated services are 32-bit only
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/chromium_http/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/aacenc/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/Android.mk | 2 |
4 files changed, 7 insertions, 0 deletions
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) |