aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2014-03-24 19:01:18 -0500
committerGerrit Code Review2014-03-24 19:01:19 -0500
commit653e7a4015341c87b4d55ec9a94ec7bdee044f6f (patch)
tree252af255884d55166115e09c74280aeeeeeb5553
parente698fd4a6f8d3057d520c3a4aa4cb835005fefeb (diff)
parent0dc8cd263c89e4e59092b58c6cd3e5ccddda1dd8 (diff)
downloadplatform-external-tinyalsa-653e7a4015341c87b4d55ec9a94ec7bdee044f6f.tar.gz
platform-external-tinyalsa-653e7a4015341c87b4d55ec9a94ec7bdee044f6f.tar.xz
platform-external-tinyalsa-653e7a4015341c87b4d55ec9a94ec7bdee044f6f.zip
Merge "Revert "Update 64-bit blacklist for tinyalsa""
-rw-r--r--Android.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 423363d..4f6db22 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,6 @@ 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
11 10
12include $(BUILD_SHARED_LIBRARY) 11include $(BUILD_SHARED_LIBRARY)
13 12
@@ -26,7 +25,6 @@ LOCAL_SRC_FILES:= tinyplay.c
26LOCAL_MODULE := tinyplay 25LOCAL_MODULE := tinyplay
27LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 26LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
28LOCAL_MODULE_TAGS := optional 27LOCAL_MODULE_TAGS := optional
29LOCAL_32_BIT_ONLY := true
30 28
31include $(BUILD_EXECUTABLE) 29include $(BUILD_EXECUTABLE)
32 30
@@ -36,7 +34,6 @@ LOCAL_SRC_FILES:= tinycap.c
36LOCAL_MODULE := tinycap 34LOCAL_MODULE := tinycap
37LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 35LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
38LOCAL_MODULE_TAGS := optional 36LOCAL_MODULE_TAGS := optional
39LOCAL_32_BIT_ONLY := true
40 37
41include $(BUILD_EXECUTABLE) 38include $(BUILD_EXECUTABLE)
42 39
@@ -46,7 +43,6 @@ LOCAL_SRC_FILES:= tinymix.c
46LOCAL_MODULE := tinymix 43LOCAL_MODULE := tinymix
47LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 44LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
48LOCAL_MODULE_TAGS := optional 45LOCAL_MODULE_TAGS := optional
49LOCAL_32_BIT_ONLY := true
50 46
51include $(BUILD_EXECUTABLE) 47include $(BUILD_EXECUTABLE)
52 48
@@ -56,6 +52,5 @@ LOCAL_SRC_FILES:= tinypcminfo.c
56LOCAL_MODULE := tinypcminfo 52LOCAL_MODULE := tinypcminfo
57LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 53LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
58LOCAL_MODULE_TAGS := optional 54LOCAL_MODULE_TAGS := optional
59LOCAL_32_BIT_ONLY := true
60 55
61include $(BUILD_EXECUTABLE) 56include $(BUILD_EXECUTABLE)