aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2014-03-24 19:20:36 -0500
committerAndroid Git Automerger2014-03-24 19:20:36 -0500
commit97a9aa8760022a506b251257dd4e570a54fab5a1 (patch)
tree9ea169b3891c1141ff918bd0669ecce518f276bc
parenta5b44d9bba0c5df52b37850bb929eb53817fb4a4 (diff)
parent653e7a4015341c87b4d55ec9a94ec7bdee044f6f (diff)
downloadplatform-external-tinyalsa-97a9aa8760022a506b251257dd4e570a54fab5a1.tar.gz
platform-external-tinyalsa-97a9aa8760022a506b251257dd4e570a54fab5a1.tar.xz
platform-external-tinyalsa-97a9aa8760022a506b251257dd4e570a54fab5a1.zip
am 653e7a40: Merge "Revert "Update 64-bit blacklist for tinyalsa""
* commit '653e7a4015341c87b4d55ec9a94ec7bdee044f6f': 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 23cb001..006e588 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
@@ -47,7 +45,6 @@ LOCAL_SRC_FILES:= tinycap.c
47LOCAL_MODULE := tinycap 45LOCAL_MODULE := tinycap
48LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 46LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
49LOCAL_MODULE_TAGS := optional 47LOCAL_MODULE_TAGS := optional
50LOCAL_32_BIT_ONLY := true
51 48
52include $(BUILD_EXECUTABLE) 49include $(BUILD_EXECUTABLE)
53 50
@@ -57,7 +54,6 @@ LOCAL_SRC_FILES:= tinymix.c
57LOCAL_MODULE := tinymix 54LOCAL_MODULE := tinymix
58LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 55LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
59LOCAL_MODULE_TAGS := optional 56LOCAL_MODULE_TAGS := optional
60LOCAL_32_BIT_ONLY := true
61 57
62include $(BUILD_EXECUTABLE) 58include $(BUILD_EXECUTABLE)
63 59
@@ -67,6 +63,5 @@ LOCAL_SRC_FILES:= tinypcminfo.c
67LOCAL_MODULE := tinypcminfo 63LOCAL_MODULE := tinypcminfo
68LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa 64LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
69LOCAL_MODULE_TAGS := optional 65LOCAL_MODULE_TAGS := optional
70LOCAL_32_BIT_ONLY := true
71 66
72include $(BUILD_EXECUTABLE) 67include $(BUILD_EXECUTABLE)