diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-03-19 20:58:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-19 20:58:48 +0000 |
| commit | 24e1bd71ac6850d9062b3bd803b37c0e92f69c7a (patch) | |
| tree | f21e4aadfd709d10588a17faf9b296258587e137 /media/libstagefright | |
| parent | bd7bde794c587dc9443c22abd3bcaa78fd804615 (diff) | |
| parent | f3aa039a2278f789e3c9d5e18b83f9d937a05a5f (diff) | |
| download | frameworks_av-24e1bd71ac6850d9062b3bd803b37c0e92f69c7a.zip frameworks_av-24e1bd71ac6850d9062b3bd803b37c0e92f69c7a.tar.gz frameworks_av-24e1bd71ac6850d9062b3bd803b37c0e92f69c7a.tar.bz2 | |
Merge "libstagefright is no longer 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 | ||||
| -rw-r--r-- | media/libstagefright/httplive/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/id3/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/Android.mk | 2 |
7 files changed, 0 insertions, 13 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 4f17ea5..6a2a696 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -122,8 +122,6 @@ 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 25a25ab..f26f386 100644 --- a/media/libstagefright/chromium_http/Android.mk +++ b/media/libstagefright/chromium_http/Android.mk @@ -33,7 +33,5 @@ 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 35348de..057c69b 100644 --- a/media/libstagefright/codecs/aacenc/Android.mk +++ b/media/libstagefright/codecs/aacenc/Android.mk @@ -113,7 +113,6 @@ 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 d4381e4..7d17c2a 100644 --- a/media/libstagefright/codecs/avc/enc/Android.mk +++ b/media/libstagefright/codecs/avc/enc/Android.mk @@ -20,7 +20,6 @@ LOCAL_SRC_FILES := \ LOCAL_MODULE := libstagefright_avcenc -LOCAL_32_BIT_ONLY := true LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/src \ @@ -69,6 +68,5 @@ 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/libstagefright/httplive/Android.mk b/media/libstagefright/httplive/Android.mk index f382e2e..f3529f9 100644 --- a/media/libstagefright/httplive/Android.mk +++ b/media/libstagefright/httplive/Android.mk @@ -28,6 +28,4 @@ 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 5a18cab..bf6f7bb 100644 --- a/media/libstagefright/id3/Android.mk +++ b/media/libstagefright/id3/Android.mk @@ -25,6 +25,4 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := testid3 -LOCAL_32_BIT_ONLY := true - include $(BUILD_EXECUTABLE) diff --git a/media/libstagefright/wifi-display/Android.mk b/media/libstagefright/wifi-display/Android.mk index d27a8ff..f70454a 100644 --- a/media/libstagefright/wifi-display/Android.mk +++ b/media/libstagefright/wifi-display/Android.mk @@ -34,6 +34,4 @@ LOCAL_MODULE:= libstagefright_wfd LOCAL_MODULE_TAGS:= optional -LOCAL_32_BIT_ONLY := true - include $(BUILD_SHARED_LIBRARY) |