diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-14 20:45:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-14 20:45:50 +0000 |
| commit | 089affb6c2d9ed1e2d49df4be02d30dc490506f9 (patch) | |
| tree | 1ec3cbbd3a0d1de16e11a6a0585b5833f3843f66 /media | |
| parent | 4a67fc49d926c75fa6a96160ba5627fb0e209db6 (diff) | |
| parent | af783aa91f7a279153fb8bab8d0d6b9f737996e9 (diff) | |
| download | frameworks_av-089affb6c2d9ed1e2d49df4be02d30dc490506f9.zip frameworks_av-089affb6c2d9ed1e2d49df4be02d30dc490506f9.tar.gz frameworks_av-089affb6c2d9ed1e2d49df4be02d30dc490506f9.tar.bz2 | |
Merge "mediaserver and associated services are 32-bit only"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 2 | ||||
| -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 | ||||
| -rw-r--r-- | media/mediaserver/Android.mk | 1 |
6 files changed, 10 insertions, 0 deletions
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) |