summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adb/Android.mk3
-rw-r--r--libion/tests/Android.mk1
-rw-r--r--liblog/tests/Android.mk2
-rw-r--r--libsync/tests/Android.mk1
-rw-r--r--libutils/tests/Android.mk1
-rw-r--r--libziparchive/Android.mk5
-rw-r--r--logcat/tests/Android.mk2
-rw-r--r--logd/tests/Android.mk1
-rw-r--r--toolbox/Android.mk4
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
162endif 162endif
163 163
164LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
165include $(BUILD_HOST_EXECUTABLE) 164include $(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
224LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
225
226include $(BUILD_EXECUTABLE) 223include $(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
19include $(CLEAR_VARS) 19include $(CLEAR_VARS)
20LOCAL_MODULE := ion-unit-tests 20LOCAL_MODULE := ion-unit-tests
21LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
22LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers 21LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers
23LOCAL_SHARED_LIBRARIES += libion 22LOCAL_SHARED_LIBRARIES += libion
24LOCAL_C_INCLUDES := $(LOCAL_PATH)/../kernel-headers 23LOCAL_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 := \
39include $(CLEAR_VARS) 39include $(CLEAR_VARS)
40LOCAL_MODULE := $(test_module_prefix)benchmarks 40LOCAL_MODULE := $(test_module_prefix)benchmarks
41LOCAL_MODULE_TAGS := $(test_tags) 41LOCAL_MODULE_TAGS := $(test_tags)
42LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
43LOCAL_CFLAGS += $(benchmark_c_flags) 42LOCAL_CFLAGS += $(benchmark_c_flags)
44LOCAL_SHARED_LIBRARIES += liblog libm 43LOCAL_SHARED_LIBRARIES += liblog libm
45LOCAL_SRC_FILES := $(benchmark_src_files) 44LOCAL_SRC_FILES := $(benchmark_src_files)
@@ -77,7 +76,6 @@ endif
77include $(CLEAR_VARS) 76include $(CLEAR_VARS)
78LOCAL_MODULE := $(test_module_prefix)unit-tests 77LOCAL_MODULE := $(test_module_prefix)unit-tests
79LOCAL_MODULE_TAGS := $(test_tags) 78LOCAL_MODULE_TAGS := $(test_tags)
80LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
81LOCAL_CFLAGS += $(test_c_flags) 79LOCAL_CFLAGS += $(test_c_flags)
82LOCAL_SHARED_LIBRARIES := liblog 80LOCAL_SHARED_LIBRARIES := liblog
83LOCAL_SRC_FILES := $(test_src_files) 81LOCAL_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)
19include $(CLEAR_VARS) 19include $(CLEAR_VARS)
20LOCAL_CLANG := true 20LOCAL_CLANG := true
21LOCAL_MODULE := sync-unit-tests 21LOCAL_MODULE := sync-unit-tests
22LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
23LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers -Wno-sign-compare 22LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers -Wno-sign-compare
24LOCAL_SHARED_LIBRARIES += libsync 23LOCAL_SHARED_LIBRARIES += libsync
25LOCAL_STATIC_LIBRARIES += libgtest_main 24LOCAL_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 @@
18LOCAL_PATH := $(call my-dir) 18LOCAL_PATH := $(call my-dir)
19 19
20include $(CLEAR_VARS) 20include $(CLEAR_VARS)
21LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
22 21
23LOCAL_MODULE := libutils_tests 22LOCAL_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)
18source_files := zip_archive.cc 18source_files := zip_archive.cc
19 19
20include $(CLEAR_VARS) 20include $(CLEAR_VARS)
21LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
22LOCAL_CPP_EXTENSION := .cc 21LOCAL_CPP_EXTENSION := .cc
23LOCAL_SRC_FILES := ${source_files} 22LOCAL_SRC_FILES := ${source_files}
24LOCAL_STATIC_LIBRARIES := libz 23LOCAL_STATIC_LIBRARIES := libz
@@ -29,7 +28,6 @@ LOCAL_CPPFLAGS := -Wold-style-cast
29include $(BUILD_STATIC_LIBRARY) 28include $(BUILD_STATIC_LIBRARY)
30 29
31include $(CLEAR_VARS) 30include $(CLEAR_VARS)
32LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
33LOCAL_CPP_EXTENSION := .cc 31LOCAL_CPP_EXTENSION := .cc
34LOCAL_SRC_FILES := ${source_files} 32LOCAL_SRC_FILES := ${source_files}
35LOCAL_STATIC_LIBRARIES := libz libutils 33LOCAL_STATIC_LIBRARIES := libz libutils
@@ -42,7 +40,6 @@ LOCAL_MULTILIB := both
42include $(BUILD_HOST_STATIC_LIBRARY) 40include $(BUILD_HOST_STATIC_LIBRARY)
43 41
44include $(CLEAR_VARS) 42include $(CLEAR_VARS)
45LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
46LOCAL_CPP_EXTENSION := .cc 43LOCAL_CPP_EXTENSION := .cc
47LOCAL_SRC_FILES := ${source_files} 44LOCAL_SRC_FILES := ${source_files}
48LOCAL_STATIC_LIBRARIES := libz libutils 45LOCAL_STATIC_LIBRARIES := libz libutils
@@ -54,7 +51,6 @@ include $(BUILD_HOST_SHARED_LIBRARY)
54 51
55# Tests. 52# Tests.
56include $(CLEAR_VARS) 53include $(CLEAR_VARS)
57LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
58LOCAL_MODULE := ziparchive-tests 54LOCAL_MODULE := ziparchive-tests
59LOCAL_CPP_EXTENSION := .cc 55LOCAL_CPP_EXTENSION := .cc
60LOCAL_CFLAGS := -Werror 56LOCAL_CFLAGS := -Werror
@@ -64,7 +60,6 @@ LOCAL_STATIC_LIBRARIES := libziparchive libz libutils
64include $(BUILD_NATIVE_TEST) 60include $(BUILD_NATIVE_TEST)
65 61
66include $(CLEAR_VARS) 62include $(CLEAR_VARS)
67LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
68LOCAL_MODULE := ziparchive-tests-host 63LOCAL_MODULE := ziparchive-tests-host
69LOCAL_CPP_EXTENSION := .cc 64LOCAL_CPP_EXTENSION := .cc
70LOCAL_CFLAGS += \ 65LOCAL_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 := \
39include $(CLEAR_VARS) 39include $(CLEAR_VARS)
40LOCAL_MODULE := $(test_module_prefix)benchmarks 40LOCAL_MODULE := $(test_module_prefix)benchmarks
41LOCAL_MODULE_TAGS := $(test_tags) 41LOCAL_MODULE_TAGS := $(test_tags)
42LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
43LOCAL_CFLAGS += $(test_c_flags) 42LOCAL_CFLAGS += $(test_c_flags)
44LOCAL_SRC_FILES := $(benchmark_src_files) 43LOCAL_SRC_FILES := $(benchmark_src_files)
45include $(BUILD_NATIVE_TEST) 44include $(BUILD_NATIVE_TEST)
@@ -56,7 +55,6 @@ test_src_files := \
56include $(CLEAR_VARS) 55include $(CLEAR_VARS)
57LOCAL_MODULE := $(test_module_prefix)unit-tests 56LOCAL_MODULE := $(test_module_prefix)unit-tests
58LOCAL_MODULE_TAGS := $(test_tags) 57LOCAL_MODULE_TAGS := $(test_tags)
59LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
60LOCAL_CFLAGS += $(test_c_flags) 58LOCAL_CFLAGS += $(test_c_flags)
61LOCAL_SHARED_LIBRARIES := liblog 59LOCAL_SHARED_LIBRARIES := liblog
62LOCAL_SRC_FILES := $(test_src_files) 60LOCAL_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 := \
46include $(CLEAR_VARS) 46include $(CLEAR_VARS)
47LOCAL_MODULE := $(test_module_prefix)unit-tests 47LOCAL_MODULE := $(test_module_prefix)unit-tests
48LOCAL_MODULE_TAGS := $(test_tags) 48LOCAL_MODULE_TAGS := $(test_tags)
49LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
50LOCAL_CFLAGS += $(test_c_flags) 49LOCAL_CFLAGS += $(test_c_flags)
51LOCAL_SHARED_LIBRARIES := libcutils 50LOCAL_SHARED_LIBRARIES := libcutils
52LOCAL_SRC_FILES := $(test_src_files) 51LOCAL_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
24LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV 24LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV
25LOCAL_MODULE := libtoolbox_dd 25LOCAL_MODULE := libtoolbox_dd
26LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
27include $(BUILD_STATIC_LIBRARY) 26include $(BUILD_STATIC_LIBRARY)
28 27
29include $(CLEAR_VARS) 28include $(CLEAR_VARS)
30LOCAL_SRC_FILES := upstream-netbsd/usr.bin/du/du.c 29LOCAL_SRC_FILES := upstream-netbsd/usr.bin/du/du.c
31LOCAL_CFLAGS += $(common_cflags) -Dmain=du_main 30LOCAL_CFLAGS += $(common_cflags) -Dmain=du_main
32LOCAL_MODULE := libtoolbox_du 31LOCAL_MODULE := libtoolbox_du
33LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
34include $(BUILD_STATIC_LIBRARY) 32include $(BUILD_STATIC_LIBRARY)
35 33
36 34
@@ -82,7 +80,6 @@ LOCAL_SHARED_LIBRARIES := \
82LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS)) 80LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS))
83 81
84LOCAL_MODULE := toolbox 82LOCAL_MODULE := toolbox
85LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
86 83
87# Install the symlinks. 84# Install the symlinks.
88LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toolbox $(TARGET_OUT)/bin/$(t);) 85LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toolbox $(TARGET_OUT)/bin/$(t);)
@@ -115,7 +112,6 @@ LOCAL_SRC_FILES := r.c
115LOCAL_CFLAGS += $(common_cflags) 112LOCAL_CFLAGS += $(common_cflags)
116LOCAL_MODULE := r 113LOCAL_MODULE := r
117LOCAL_MODULE_TAGS := debug 114LOCAL_MODULE_TAGS := debug
118LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
119include $(BUILD_EXECUTABLE) 115include $(BUILD_EXECUTABLE)
120 116
121 117