diff options
-rw-r--r-- | adb/Android.mk | 3 | ||||
-rw-r--r-- | libion/tests/Android.mk | 1 | ||||
-rw-r--r-- | liblog/tests/Android.mk | 2 | ||||
-rw-r--r-- | libsync/tests/Android.mk | 1 | ||||
-rw-r--r-- | libutils/tests/Android.mk | 1 | ||||
-rw-r--r-- | libziparchive/Android.mk | 5 | ||||
-rw-r--r-- | logcat/tests/Android.mk | 2 | ||||
-rw-r--r-- | logd/tests/Android.mk | 1 | ||||
-rw-r--r-- | toolbox/Android.mk | 4 |
9 files changed, 0 insertions, 20 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 4f19d4783..3733ae3e2 100644 --- a/adb/Android.mk +++ b/adb/Android.mk | |||
@@ -161,7 +161,6 @@ ifeq ($(USE_SYSDEPS_WIN32),) | |||
161 | LOCAL_STATIC_LIBRARIES += libcutils | 161 | LOCAL_STATIC_LIBRARIES += libcutils |
162 | endif | 162 | endif |
163 | 163 | ||
164 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
165 | include $(BUILD_HOST_EXECUTABLE) | 164 | include $(BUILD_HOST_EXECUTABLE) |
166 | 165 | ||
167 | $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) | 166 | $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) |
@@ -221,6 +220,4 @@ LOCAL_STATIC_LIBRARIES := \ | |||
221 | libselinux \ | 220 | libselinux \ |
222 | libext4_utils_static \ | 221 | libext4_utils_static \ |
223 | 222 | ||
224 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
225 | |||
226 | include $(BUILD_EXECUTABLE) | 223 | include $(BUILD_EXECUTABLE) |
diff --git a/libion/tests/Android.mk b/libion/tests/Android.mk index abf527ad6..894f90e4a 100644 --- a/libion/tests/Android.mk +++ b/libion/tests/Android.mk | |||
@@ -18,7 +18,6 @@ LOCAL_PATH:= $(call my-dir) | |||
18 | 18 | ||
19 | include $(CLEAR_VARS) | 19 | include $(CLEAR_VARS) |
20 | LOCAL_MODULE := ion-unit-tests | 20 | LOCAL_MODULE := ion-unit-tests |
21 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
22 | LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers | 21 | LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers |
23 | LOCAL_SHARED_LIBRARIES += libion | 22 | LOCAL_SHARED_LIBRARIES += libion |
24 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers | 23 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers |
diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk index 8137a751a..d75bbc942 100644 --- a/liblog/tests/Android.mk +++ b/liblog/tests/Android.mk | |||
@@ -39,7 +39,6 @@ benchmark_src_files := \ | |||
39 | include $(CLEAR_VARS) | 39 | include $(CLEAR_VARS) |
40 | LOCAL_MODULE := $(test_module_prefix)benchmarks | 40 | LOCAL_MODULE := $(test_module_prefix)benchmarks |
41 | LOCAL_MODULE_TAGS := $(test_tags) | 41 | LOCAL_MODULE_TAGS := $(test_tags) |
42 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
43 | LOCAL_CFLAGS += $(benchmark_c_flags) | 42 | LOCAL_CFLAGS += $(benchmark_c_flags) |
44 | LOCAL_SHARED_LIBRARIES += liblog libm | 43 | LOCAL_SHARED_LIBRARIES += liblog libm |
45 | LOCAL_SRC_FILES := $(benchmark_src_files) | 44 | LOCAL_SRC_FILES := $(benchmark_src_files) |
@@ -77,7 +76,6 @@ endif | |||
77 | include $(CLEAR_VARS) | 76 | include $(CLEAR_VARS) |
78 | LOCAL_MODULE := $(test_module_prefix)unit-tests | 77 | LOCAL_MODULE := $(test_module_prefix)unit-tests |
79 | LOCAL_MODULE_TAGS := $(test_tags) | 78 | LOCAL_MODULE_TAGS := $(test_tags) |
80 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
81 | LOCAL_CFLAGS += $(test_c_flags) | 79 | LOCAL_CFLAGS += $(test_c_flags) |
82 | LOCAL_SHARED_LIBRARIES := liblog | 80 | LOCAL_SHARED_LIBRARIES := liblog |
83 | LOCAL_SRC_FILES := $(test_src_files) | 81 | LOCAL_SRC_FILES := $(test_src_files) |
diff --git a/libsync/tests/Android.mk b/libsync/tests/Android.mk index 9c9562a1f..8137c7af6 100644 --- a/libsync/tests/Android.mk +++ b/libsync/tests/Android.mk | |||
@@ -19,7 +19,6 @@ LOCAL_PATH:= $(call my-dir) | |||
19 | include $(CLEAR_VARS) | 19 | include $(CLEAR_VARS) |
20 | LOCAL_CLANG := true | 20 | LOCAL_CLANG := true |
21 | LOCAL_MODULE := sync-unit-tests | 21 | LOCAL_MODULE := sync-unit-tests |
22 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
23 | LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers -Wno-sign-compare | 22 | LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers -Wno-sign-compare |
24 | LOCAL_SHARED_LIBRARIES += libsync | 23 | LOCAL_SHARED_LIBRARIES += libsync |
25 | LOCAL_STATIC_LIBRARIES += libgtest_main | 24 | LOCAL_STATIC_LIBRARIES += libgtest_main |
diff --git a/libutils/tests/Android.mk b/libutils/tests/Android.mk index 634f44f48..7cfad89ca 100644 --- a/libutils/tests/Android.mk +++ b/libutils/tests/Android.mk | |||
@@ -18,7 +18,6 @@ | |||
18 | LOCAL_PATH := $(call my-dir) | 18 | LOCAL_PATH := $(call my-dir) |
19 | 19 | ||
20 | include $(CLEAR_VARS) | 20 | include $(CLEAR_VARS) |
21 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
22 | 21 | ||
23 | LOCAL_MODULE := libutils_tests | 22 | LOCAL_MODULE := libutils_tests |
24 | 23 | ||
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index 3937449a8..0d31001aa 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk | |||
@@ -18,7 +18,6 @@ LOCAL_PATH := $(call my-dir) | |||
18 | source_files := zip_archive.cc | 18 | source_files := zip_archive.cc |
19 | 19 | ||
20 | include $(CLEAR_VARS) | 20 | include $(CLEAR_VARS) |
21 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
22 | LOCAL_CPP_EXTENSION := .cc | 21 | LOCAL_CPP_EXTENSION := .cc |
23 | LOCAL_SRC_FILES := ${source_files} | 22 | LOCAL_SRC_FILES := ${source_files} |
24 | LOCAL_STATIC_LIBRARIES := libz | 23 | LOCAL_STATIC_LIBRARIES := libz |
@@ -29,7 +28,6 @@ LOCAL_CPPFLAGS := -Wold-style-cast | |||
29 | include $(BUILD_STATIC_LIBRARY) | 28 | include $(BUILD_STATIC_LIBRARY) |
30 | 29 | ||
31 | include $(CLEAR_VARS) | 30 | include $(CLEAR_VARS) |
32 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
33 | LOCAL_CPP_EXTENSION := .cc | 31 | LOCAL_CPP_EXTENSION := .cc |
34 | LOCAL_SRC_FILES := ${source_files} | 32 | LOCAL_SRC_FILES := ${source_files} |
35 | LOCAL_STATIC_LIBRARIES := libz libutils | 33 | LOCAL_STATIC_LIBRARIES := libz libutils |
@@ -42,7 +40,6 @@ LOCAL_MULTILIB := both | |||
42 | include $(BUILD_HOST_STATIC_LIBRARY) | 40 | include $(BUILD_HOST_STATIC_LIBRARY) |
43 | 41 | ||
44 | include $(CLEAR_VARS) | 42 | include $(CLEAR_VARS) |
45 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
46 | LOCAL_CPP_EXTENSION := .cc | 43 | LOCAL_CPP_EXTENSION := .cc |
47 | LOCAL_SRC_FILES := ${source_files} | 44 | LOCAL_SRC_FILES := ${source_files} |
48 | LOCAL_STATIC_LIBRARIES := libz libutils | 45 | LOCAL_STATIC_LIBRARIES := libz libutils |
@@ -54,7 +51,6 @@ include $(BUILD_HOST_SHARED_LIBRARY) | |||
54 | 51 | ||
55 | # Tests. | 52 | # Tests. |
56 | include $(CLEAR_VARS) | 53 | include $(CLEAR_VARS) |
57 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
58 | LOCAL_MODULE := ziparchive-tests | 54 | LOCAL_MODULE := ziparchive-tests |
59 | LOCAL_CPP_EXTENSION := .cc | 55 | LOCAL_CPP_EXTENSION := .cc |
60 | LOCAL_CFLAGS := -Werror | 56 | LOCAL_CFLAGS := -Werror |
@@ -64,7 +60,6 @@ LOCAL_STATIC_LIBRARIES := libziparchive libz libutils | |||
64 | include $(BUILD_NATIVE_TEST) | 60 | include $(BUILD_NATIVE_TEST) |
65 | 61 | ||
66 | include $(CLEAR_VARS) | 62 | include $(CLEAR_VARS) |
67 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
68 | LOCAL_MODULE := ziparchive-tests-host | 63 | LOCAL_MODULE := ziparchive-tests-host |
69 | LOCAL_CPP_EXTENSION := .cc | 64 | LOCAL_CPP_EXTENSION := .cc |
70 | LOCAL_CFLAGS += \ | 65 | LOCAL_CFLAGS += \ |
diff --git a/logcat/tests/Android.mk b/logcat/tests/Android.mk index 015a23df1..a28664e30 100644 --- a/logcat/tests/Android.mk +++ b/logcat/tests/Android.mk | |||
@@ -39,7 +39,6 @@ benchmark_src_files := \ | |||
39 | include $(CLEAR_VARS) | 39 | include $(CLEAR_VARS) |
40 | LOCAL_MODULE := $(test_module_prefix)benchmarks | 40 | LOCAL_MODULE := $(test_module_prefix)benchmarks |
41 | LOCAL_MODULE_TAGS := $(test_tags) | 41 | LOCAL_MODULE_TAGS := $(test_tags) |
42 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
43 | LOCAL_CFLAGS += $(test_c_flags) | 42 | LOCAL_CFLAGS += $(test_c_flags) |
44 | LOCAL_SRC_FILES := $(benchmark_src_files) | 43 | LOCAL_SRC_FILES := $(benchmark_src_files) |
45 | include $(BUILD_NATIVE_TEST) | 44 | include $(BUILD_NATIVE_TEST) |
@@ -56,7 +55,6 @@ test_src_files := \ | |||
56 | include $(CLEAR_VARS) | 55 | include $(CLEAR_VARS) |
57 | LOCAL_MODULE := $(test_module_prefix)unit-tests | 56 | LOCAL_MODULE := $(test_module_prefix)unit-tests |
58 | LOCAL_MODULE_TAGS := $(test_tags) | 57 | LOCAL_MODULE_TAGS := $(test_tags) |
59 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
60 | LOCAL_CFLAGS += $(test_c_flags) | 58 | LOCAL_CFLAGS += $(test_c_flags) |
61 | LOCAL_SHARED_LIBRARIES := liblog | 59 | LOCAL_SHARED_LIBRARIES := liblog |
62 | LOCAL_SRC_FILES := $(test_src_files) | 60 | LOCAL_SRC_FILES := $(test_src_files) |
diff --git a/logd/tests/Android.mk b/logd/tests/Android.mk index f8512888b..85ca4ac92 100644 --- a/logd/tests/Android.mk +++ b/logd/tests/Android.mk | |||
@@ -46,7 +46,6 @@ test_src_files := \ | |||
46 | include $(CLEAR_VARS) | 46 | include $(CLEAR_VARS) |
47 | LOCAL_MODULE := $(test_module_prefix)unit-tests | 47 | LOCAL_MODULE := $(test_module_prefix)unit-tests |
48 | LOCAL_MODULE_TAGS := $(test_tags) | 48 | LOCAL_MODULE_TAGS := $(test_tags) |
49 | LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk | ||
50 | LOCAL_CFLAGS += $(test_c_flags) | 49 | LOCAL_CFLAGS += $(test_c_flags) |
51 | LOCAL_SHARED_LIBRARIES := libcutils | 50 | LOCAL_SHARED_LIBRARIES := libcutils |
52 | LOCAL_SRC_FILES := $(test_src_files) | 51 | LOCAL_SRC_FILES := $(test_src_files) |
diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 4e54eb8b1..ff001a878 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk | |||
@@ -23,14 +23,12 @@ LOCAL_SRC_FILES := \ | |||
23 | upstream-netbsd/lib/libutil/raise_default_signal.c | 23 | upstream-netbsd/lib/libutil/raise_default_signal.c |
24 | LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV | 24 | LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV |
25 | LOCAL_MODULE := libtoolbox_dd | 25 | LOCAL_MODULE := libtoolbox_dd |
26 | LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk | ||
27 | include $(BUILD_STATIC_LIBRARY) | 26 | include $(BUILD_STATIC_LIBRARY) |
28 | 27 | ||
29 | include $(CLEAR_VARS) | 28 | include $(CLEAR_VARS) |
30 | LOCAL_SRC_FILES := upstream-netbsd/usr.bin/du/du.c | 29 | LOCAL_SRC_FILES := upstream-netbsd/usr.bin/du/du.c |
31 | LOCAL_CFLAGS += $(common_cflags) -Dmain=du_main | 30 | LOCAL_CFLAGS += $(common_cflags) -Dmain=du_main |
32 | LOCAL_MODULE := libtoolbox_du | 31 | LOCAL_MODULE := libtoolbox_du |
33 | LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk | ||
34 | include $(BUILD_STATIC_LIBRARY) | 32 | include $(BUILD_STATIC_LIBRARY) |
35 | 33 | ||
36 | 34 | ||
@@ -82,7 +80,6 @@ LOCAL_SHARED_LIBRARIES := \ | |||
82 | LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS)) | 80 | LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS)) |
83 | 81 | ||
84 | LOCAL_MODULE := toolbox | 82 | LOCAL_MODULE := toolbox |
85 | LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk | ||
86 | 83 | ||
87 | # Install the symlinks. | 84 | # Install the symlinks. |
88 | LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toolbox $(TARGET_OUT)/bin/$(t);) | 85 | LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toolbox $(TARGET_OUT)/bin/$(t);) |
@@ -115,7 +112,6 @@ LOCAL_SRC_FILES := r.c | |||
115 | LOCAL_CFLAGS += $(common_cflags) | 112 | LOCAL_CFLAGS += $(common_cflags) |
116 | LOCAL_MODULE := r | 113 | LOCAL_MODULE := r |
117 | LOCAL_MODULE_TAGS := debug | 114 | LOCAL_MODULE_TAGS := debug |
118 | LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk | ||
119 | include $(BUILD_EXECUTABLE) | 115 | include $(BUILD_EXECUTABLE) |
120 | 116 | ||
121 | 117 | ||