diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-18 17:21:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-18 17:21:30 +0000 |
| commit | 098b28fc88b3d96eada2f9db318d9c38c70cf674 (patch) | |
| tree | 23d522a776d4939a12c929933ab7f41f22d33949 /media | |
| parent | 557847ee511dd5e75d584ff04449322f0f098241 (diff) | |
| parent | 64727dd7c8513b6c9ddcce2f4b305618bb76121c (diff) | |
| download | frameworks_av-098b28fc88b3d96eada2f9db318d9c38c70cf674.zip frameworks_av-098b28fc88b3d96eada2f9db318d9c38c70cf674.tar.gz frameworks_av-098b28fc88b3d96eada2f9db318d9c38c70cf674.tar.bz2 | |
am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"
* commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c':
More precise 32-bit only for libstagefright/ subdirectories
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/httplive/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/id3/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/tests/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/tests/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/Android.mk | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/media/libstagefright/httplive/Android.mk b/media/libstagefright/httplive/Android.mk index f3529f9..f382e2e 100644 --- a/media/libstagefright/httplive/Android.mk +++ b/media/libstagefright/httplive/Android.mk @@ -28,4 +28,6 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -Wno-psabi endif +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) diff --git a/media/libstagefright/id3/Android.mk b/media/libstagefright/id3/Android.mk index bf6f7bb..5a18cab 100644 --- a/media/libstagefright/id3/Android.mk +++ b/media/libstagefright/id3/Android.mk @@ -25,4 +25,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := testid3 +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk index 1061c39..e368134 100644 --- a/media/libstagefright/omx/tests/Android.mk +++ b/media/libstagefright/omx/tests/Android.mk @@ -15,4 +15,6 @@ LOCAL_MODULE := omx_tests LOCAL_MODULE_TAGS := tests +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) diff --git a/media/libstagefright/tests/Android.mk b/media/libstagefright/tests/Android.mk index 06ce16b..903af49 100644 --- a/media/libstagefright/tests/Android.mk +++ b/media/libstagefright/tests/Android.mk @@ -41,6 +41,8 @@ LOCAL_C_INCLUDES := \ frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax \ +LOCAL_32_BIT_ONLY := true + include $(BUILD_EXECUTABLE) endif diff --git a/media/libstagefright/wifi-display/Android.mk b/media/libstagefright/wifi-display/Android.mk index f70454a..d27a8ff 100644 --- a/media/libstagefright/wifi-display/Android.mk +++ b/media/libstagefright/wifi-display/Android.mk @@ -34,4 +34,6 @@ LOCAL_MODULE:= libstagefright_wfd LOCAL_MODULE_TAGS:= optional +LOCAL_32_BIT_ONLY := true + include $(BUILD_SHARED_LIBRARY) |