diff options
author | Colin Cross | 2014-03-24 19:20:36 -0500 |
---|---|---|
committer | Android Git Automerger | 2014-03-24 19:20:36 -0500 |
commit | 97a9aa8760022a506b251257dd4e570a54fab5a1 (patch) | |
tree | 9ea169b3891c1141ff918bd0669ecce518f276bc | |
parent | a5b44d9bba0c5df52b37850bb929eb53817fb4a4 (diff) | |
parent | 653e7a4015341c87b4d55ec9a94ec7bdee044f6f (diff) | |
download | platform-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.mk | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -7,7 +7,6 @@ LOCAL_MODULE := libtinyalsa | |||
7 | LOCAL_SHARED_LIBRARIES:= libcutils libutils | 7 | LOCAL_SHARED_LIBRARIES:= libcutils libutils |
8 | LOCAL_MODULE_TAGS := optional | 8 | LOCAL_MODULE_TAGS := optional |
9 | LOCAL_PRELINK_MODULE := false | 9 | LOCAL_PRELINK_MODULE := false |
10 | LOCAL_32_BIT_ONLY := true | ||
11 | 10 | ||
12 | include $(BUILD_SHARED_LIBRARY) | 11 | include $(BUILD_SHARED_LIBRARY) |
13 | 12 | ||
@@ -26,7 +25,6 @@ LOCAL_SRC_FILES:= tinyplay.c | |||
26 | LOCAL_MODULE := tinyplay | 25 | LOCAL_MODULE := tinyplay |
27 | LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa | 26 | LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa |
28 | LOCAL_MODULE_TAGS := optional | 27 | LOCAL_MODULE_TAGS := optional |
29 | LOCAL_32_BIT_ONLY := true | ||
30 | 28 | ||
31 | include $(BUILD_EXECUTABLE) | 29 | include $(BUILD_EXECUTABLE) |
32 | 30 | ||
@@ -47,7 +45,6 @@ LOCAL_SRC_FILES:= tinycap.c | |||
47 | LOCAL_MODULE := tinycap | 45 | LOCAL_MODULE := tinycap |
48 | LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa | 46 | LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa |
49 | LOCAL_MODULE_TAGS := optional | 47 | LOCAL_MODULE_TAGS := optional |
50 | LOCAL_32_BIT_ONLY := true | ||
51 | 48 | ||
52 | include $(BUILD_EXECUTABLE) | 49 | include $(BUILD_EXECUTABLE) |
53 | 50 | ||
@@ -57,7 +54,6 @@ LOCAL_SRC_FILES:= tinymix.c | |||
57 | LOCAL_MODULE := tinymix | 54 | LOCAL_MODULE := tinymix |
58 | LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa | 55 | LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa |
59 | LOCAL_MODULE_TAGS := optional | 56 | LOCAL_MODULE_TAGS := optional |
60 | LOCAL_32_BIT_ONLY := true | ||
61 | 57 | ||
62 | include $(BUILD_EXECUTABLE) | 58 | include $(BUILD_EXECUTABLE) |
63 | 59 | ||
@@ -67,6 +63,5 @@ LOCAL_SRC_FILES:= tinypcminfo.c | |||
67 | LOCAL_MODULE := tinypcminfo | 63 | LOCAL_MODULE := tinypcminfo |
68 | LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa | 64 | LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa |
69 | LOCAL_MODULE_TAGS := optional | 65 | LOCAL_MODULE_TAGS := optional |
70 | LOCAL_32_BIT_ONLY := true | ||
71 | 66 | ||
72 | include $(BUILD_EXECUTABLE) | 67 | include $(BUILD_EXECUTABLE) |