external/alsa-utils
Revisión | 74a21a7cca7df7a74f6f3f08ccad64196b7db6bb (tree) |
---|---|
Tiempo | 2015-10-07 04:03:18 |
Autor | Chih-Wei Huang <cwhuang@linu...> |
Commiter | Chih-Wei Huang |
android: simplify the makefile and only build 32-bit executable
@@ -8,28 +8,28 @@ LOCAL_PATH:= $(call my-dir) | ||
8 | 8 | # Build aplay command |
9 | 9 | # |
10 | 10 | |
11 | -include $(CLEAR_VARS) | |
12 | - | |
13 | -LOCAL_CFLAGS := \ | |
11 | +ALSA_UTILS_CFLAGS := \ | |
14 | 12 | -fPIC -D_POSIX_SOURCE \ |
15 | 13 | -DALSA_CONFIG_DIR=\"/system/usr/share/alsa\" \ |
16 | 14 | -DALSA_PLUGIN_DIR=\"/system/usr/lib/alsa-lib\" \ |
17 | 15 | -DALSA_DEVICE_DIRECTORY=\"/dev/snd/\" |
18 | 16 | |
19 | -LOCAL_C_INCLUDES:= \ | |
17 | +ALSA_UTILS_C_INCLUDES := \ | |
20 | 18 | $(LOCAL_PATH)/include \ |
21 | - $(LOCAL_PATH)/android \ | |
22 | - external/alsa-lib/include | |
19 | + $(LOCAL_PATH)/android | |
20 | + | |
21 | +include $(CLEAR_VARS) | |
22 | + | |
23 | +LOCAL_CFLAGS := $(ALSA_UTILS_CFLAGS) | |
24 | +LOCAL_C_INCLUDES:= $(ALSA_UTILS_C_INCLUDES) | |
23 | 25 | |
24 | 26 | LOCAL_SRC_FILES := \ |
25 | 27 | aplay/aplay.c |
26 | 28 | |
27 | 29 | LOCAL_MODULE_TAGS := optional |
28 | 30 | LOCAL_MODULE := alsa_aplay |
29 | - | |
30 | -LOCAL_SHARED_LIBRARIES := \ | |
31 | - libasound \ | |
32 | - libc | |
31 | +LOCAL_MULTILIB := 32 | |
32 | +LOCAL_SHARED_LIBRARIES := libasound | |
33 | 33 | |
34 | 34 | include $(BUILD_EXECUTABLE) |
35 | 35 |
@@ -39,16 +39,8 @@ include $(BUILD_EXECUTABLE) | ||
39 | 39 | |
40 | 40 | include $(CLEAR_VARS) |
41 | 41 | |
42 | -LOCAL_CFLAGS := \ | |
43 | - -fPIC -D_POSIX_SOURCE \ | |
44 | - -DALSA_CONFIG_DIR=\"/system/usr/share/alsa\" \ | |
45 | - -DALSA_PLUGIN_DIR=\"/system/usr/lib/alsa-lib\" \ | |
46 | - -DALSA_DEVICE_DIRECTORY=\"/dev/snd/\" | |
47 | - | |
48 | -LOCAL_C_INCLUDES:= \ | |
49 | - $(LOCAL_PATH)/include \ | |
50 | - $(LOCAL_PATH)/android \ | |
51 | - external/alsa-lib/include | |
42 | +LOCAL_CFLAGS := $(ALSA_UTILS_CFLAGS) | |
43 | +LOCAL_C_INCLUDES:= $(ALSA_UTILS_C_INCLUDES) | |
52 | 44 | |
53 | 45 | LOCAL_SRC_FILES := \ |
54 | 46 | alsactl/alsactl.c \ |
@@ -58,10 +50,8 @@ LOCAL_SRC_FILES := \ | ||
58 | 50 | |
59 | 51 | LOCAL_MODULE_TAGS := optional |
60 | 52 | LOCAL_MODULE := alsa_ctl |
61 | - | |
62 | -LOCAL_SHARED_LIBRARIES := \ | |
63 | - libasound \ | |
64 | - libc | |
53 | +LOCAL_MULTILIB := 32 | |
54 | +LOCAL_SHARED_LIBRARIES := libasound | |
65 | 55 | |
66 | 56 | include $(BUILD_EXECUTABLE) |
67 | 57 |
@@ -73,26 +63,16 @@ include $(BUILD_EXECUTABLE) | ||
73 | 63 | |
74 | 64 | include $(CLEAR_VARS) |
75 | 65 | |
76 | -LOCAL_CFLAGS := \ | |
77 | - -fPIC -D_POSIX_SOURCE \ | |
78 | - -DALSA_CONFIG_DIR=\"/system/usr/share/alsa/ucm\" \ | |
79 | - -DALSA_PLUGIN_DIR=\"/system/usr/lib/alsa-lib\" \ | |
80 | - -DALSA_DEVICE_DIRECTORY=\"/dev/snd/\" | |
81 | - | |
82 | -LOCAL_C_INCLUDES:= \ | |
83 | - $(LOCAL_PATH)/include \ | |
84 | - $(LOCAL_PATH)/android \ | |
85 | - external/alsa-lib/include | |
66 | +LOCAL_CFLAGS := $(ALSA_UTILS_CFLAGS) | |
67 | +LOCAL_C_INCLUDES:= $(ALSA_UTILS_C_INCLUDES) | |
86 | 68 | |
87 | 69 | LOCAL_SRC_FILES := \ |
88 | 70 | alsaucm/usecase.c \ |
89 | 71 | |
90 | 72 | LOCAL_MODULE_TAGS := debug |
91 | 73 | LOCAL_MODULE := alsa_ucm |
92 | - | |
93 | -LOCAL_SHARED_LIBRARIES := \ | |
94 | - libasound \ | |
95 | - libc | |
74 | +LOCAL_MULTILIB := 32 | |
75 | +LOCAL_SHARED_LIBRARIES := libasound | |
96 | 76 | |
97 | 77 | include $(BUILD_EXECUTABLE) |
98 | 78 |
@@ -103,26 +83,16 @@ include $(BUILD_EXECUTABLE) | ||
103 | 83 | |
104 | 84 | include $(CLEAR_VARS) |
105 | 85 | |
106 | -LOCAL_CFLAGS := \ | |
107 | - -fPIC -D_POSIX_SOURCE \ | |
108 | - -DALSA_CONFIG_DIR=\"/system/usr/share/alsa\" \ | |
109 | - -DALSA_PLUGIN_DIR=\"/system/usr/lib/alsa-lib\" \ | |
110 | - -DALSA_DEVICE_DIRECTORY=\"/dev/snd/\" | |
111 | - | |
112 | -LOCAL_C_INCLUDES:= \ | |
113 | - $(LOCAL_PATH)/include \ | |
114 | - $(LOCAL_PATH)/android \ | |
115 | - external/alsa-lib/include | |
86 | +LOCAL_CFLAGS := $(ALSA_UTILS_CFLAGS) | |
87 | +LOCAL_C_INCLUDES:= $(ALSA_UTILS_C_INCLUDES) | |
116 | 88 | |
117 | 89 | LOCAL_SRC_FILES := \ |
118 | 90 | amixer/amixer.c |
119 | 91 | |
120 | 92 | LOCAL_MODULE_TAGS := optional |
121 | 93 | LOCAL_MODULE := alsa_amixer |
122 | - | |
123 | -LOCAL_SHARED_LIBRARIES := \ | |
124 | - libasound \ | |
125 | - libc | |
94 | +LOCAL_MULTILIB := 32 | |
95 | +LOCAL_SHARED_LIBRARIES := libasound | |
126 | 96 | |
127 | 97 | include $(BUILD_EXECUTABLE) |
128 | 98 |