aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten2014-03-14 15:39:47 -0500
committerAndroid Git Automerger2014-03-14 15:39:47 -0500
commit1ddcfa32c259c49c24e0792215b97d87b4ffeb68 (patch)
treea45aa14eb25cfd70c4052b0519acfb08bfb1fdcb
parentf6dfa00304becb357b0e79569903cb3a85a62e77 (diff)
parente698fd4a6f8d3057d520c3a4aa4cb835005fefeb (diff)
downloadplatform-external-tinyalsa-1ddcfa32c259c49c24e0792215b97d87b4ffeb68.tar.gz
platform-external-tinyalsa-1ddcfa32c259c49c24e0792215b97d87b4ffeb68.tar.xz
platform-external-tinyalsa-1ddcfa32c259c49c24e0792215b97d87b4ffeb68.zip
am e698fd4a: Merge "Update 64-bit blacklist for tinyalsa"
* commit 'e698fd4a6f8d3057d520c3a4aa4cb835005fefeb': Update 64-bit blacklist for tinyalsa
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 006e588..23cb001 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := libtinyalsa
7LOCAL_SHARED_LIBRARIES:= libcutils libutils 7LOCAL_SHARED_LIBRARIES:= libcutils libutils
8LOCAL_MODULE_TAGS := optional 8LOCAL_MODULE_TAGS := optional
9LOCAL_PRELINK_MODULE := false 9LOCAL_PRELINK_MODULE := false
10LOCAL_32_BIT_ONLY := true
10 11
11include $(BUILD_SHARED_LIBRARY) 12include $(BUILD_SHARED_LIBRARY)
12 13
@@ -25,6 +26,7 @@ LOCAL_SRC_FILES:= tinyplay.c
25LOCAL_MODULE := tinyplay 26LOCAL_MODULE := tinyplay
26LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 27LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
27LOCAL_MODULE_TAGS := optional 28LOCAL_MODULE_TAGS := optional
29LOCAL_32_BIT_ONLY := true
28 30
29include $(BUILD_EXECUTABLE) 31include $(BUILD_EXECUTABLE)
30 32
@@ -45,6 +47,7 @@ LOCAL_SRC_FILES:= tinycap.c
45LOCAL_MODULE := tinycap 47LOCAL_MODULE := tinycap
46LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 48LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
47LOCAL_MODULE_TAGS := optional 49LOCAL_MODULE_TAGS := optional
50LOCAL_32_BIT_ONLY := true
48 51
49include $(BUILD_EXECUTABLE) 52include $(BUILD_EXECUTABLE)
50 53
@@ -54,6 +57,7 @@ LOCAL_SRC_FILES:= tinymix.c
54LOCAL_MODULE := tinymix 57LOCAL_MODULE := tinymix
55LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 58LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
56LOCAL_MODULE_TAGS := optional 59LOCAL_MODULE_TAGS := optional
60LOCAL_32_BIT_ONLY := true
57 61
58include $(BUILD_EXECUTABLE) 62include $(BUILD_EXECUTABLE)
59 63
@@ -63,5 +67,6 @@ LOCAL_SRC_FILES:= tinypcminfo.c
63LOCAL_MODULE := tinypcminfo 67LOCAL_MODULE := tinypcminfo
64LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 68LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
65LOCAL_MODULE_TAGS := optional 69LOCAL_MODULE_TAGS := optional
70LOCAL_32_BIT_ONLY := true
66 71
67include $(BUILD_EXECUTABLE) 72include $(BUILD_EXECUTABLE)