summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-03-13 23:18:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 23:18:56 +0000
commitf404dc42d6677a1aee88d1ce996a7e8e4afe55bb (patch)
tree725221e25ff29e73fc301c746d79b5d4f40ae587
parentfaf51acb85fa235144b88fa1a88ec316a0de51da (diff)
parent5106ad0c6e664a622d177d997d3ec7147ef1ae8f (diff)
downloadlibhardware-f404dc42d6677a1aee88d1ce996a7e8e4afe55bb.tar.gz
am 5106ad0c: Merge "Audio HALs are 32-bit only"
* commit '5106ad0c6e664a622d177d997d3ec7147ef1ae8f': Audio HALs are 32-bit only
-rw-r--r--modules/audio/Android.mk2
-rw-r--r--modules/audio_remote_submix/Android.mk1
-rw-r--r--modules/usbaudio/Android.mk1
3 files changed, 4 insertions, 0 deletions
diff --git a/modules/audio/Android.mk b/modules/audio/Android.mk
index 49ed3122..84d82030 100644
--- a/modules/audio/Android.mk
+++ b/modules/audio/Android.mk
@@ -27,6 +27,7 @@ LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := audio_hw.c
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_MODULE_TAGS := optional
+LOCAL_32_BIT_ONLY := true
include $(BUILD_SHARED_LIBRARY)
@@ -39,5 +40,6 @@ LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_SRC_FILES := audio_policy.c
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_MODULE_TAGS := optional
+LOCAL_32_BIT_ONLY := true
include $(BUILD_SHARED_LIBRARY)
diff --git a/modules/audio_remote_submix/Android.mk b/modules/audio_remote_submix/Android.mk
index 50c8cb2a..d718c76f 100644
--- a/modules/audio_remote_submix/Android.mk
+++ b/modules/audio_remote_submix/Android.mk
@@ -26,5 +26,6 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libnbaio
LOCAL_STATIC_LIBRARIES := libmedia_helper
LOCAL_MODULE_TAGS := optional
+LOCAL_32_BIT_ONLY := true
include $(BUILD_SHARED_LIBRARY)
diff --git a/modules/usbaudio/Android.mk b/modules/usbaudio/Android.mk
index 199eb095..2acd1718 100644
--- a/modules/usbaudio/Android.mk
+++ b/modules/usbaudio/Android.mk
@@ -24,6 +24,7 @@ LOCAL_C_INCLUDES += \
external/tinyalsa/include
LOCAL_SHARED_LIBRARIES := liblog libcutils libtinyalsa
LOCAL_MODULE_TAGS := optional
+LOCAL_32_BIT_ONLY := true
include $(BUILD_SHARED_LIBRARY)