summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-17 11:49:35 -0700
committerGlenn Kasten <gkasten@android.com>2014-03-17 11:50:07 -0700
commitdc2b47aee47ad8690fd8dc663c6602b7efa3bbac (patch)
tree5ac6b17e738c4157c1a79ae385fb1d924623cdfb
parent0e7e5db7a0e70fd90fc61133b6a109c85eab29bf (diff)
downloadframeworks_av-dc2b47aee47ad8690fd8dc663c6602b7efa3bbac.zip
frameworks_av-dc2b47aee47ad8690fd8dc663c6602b7efa3bbac.tar.gz
frameworks_av-dc2b47aee47ad8690fd8dc663c6602b7efa3bbac.tar.bz2
More precise 32-bit only for libstagefright/ subdirectories
Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
-rw-r--r--media/libstagefright/httplive/Android.mk2
-rw-r--r--media/libstagefright/id3/Android.mk2
-rw-r--r--media/libstagefright/omx/tests/Android.mk2
-rw-r--r--media/libstagefright/tests/Android.mk2
-rw-r--r--media/libstagefright/wifi-display/Android.mk2
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)