From bcc2b5f44a39c5843eea2449cad66b8dce8721ee Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 2 Apr 2015 14:31:07 -0700 Subject: Remove LOCAL_ADDITIONAL_DEPENDENCIES in cases where it's not needed. Change-Id: I720b8ef1050da45a7833adef8219b6acb2cf3a38 --- adb/Android.mk | 3 --- libion/tests/Android.mk | 1 - liblog/tests/Android.mk | 2 -- libsync/tests/Android.mk | 1 - libutils/tests/Android.mk | 1 - libziparchive/Android.mk | 5 ----- logcat/tests/Android.mk | 2 -- logd/tests/Android.mk | 1 - toolbox/Android.mk | 4 ---- 9 files changed, 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),) LOCAL_STATIC_LIBRARIES += libcutils endif -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_EXECUTABLE) $(call dist-for-goals,dist_files sdk,$(LOCAL_BUILT_MODULE)) @@ -221,6 +220,4 @@ LOCAL_STATIC_LIBRARIES := \ libselinux \ libext4_utils_static \ -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - 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) include $(CLEAR_VARS) LOCAL_MODULE := ion-unit-tests -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers LOCAL_SHARED_LIBRARIES += libion 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 := \ include $(CLEAR_VARS) LOCAL_MODULE := $(test_module_prefix)benchmarks LOCAL_MODULE_TAGS := $(test_tags) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(benchmark_c_flags) LOCAL_SHARED_LIBRARIES += liblog libm LOCAL_SRC_FILES := $(benchmark_src_files) @@ -77,7 +76,6 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := $(test_module_prefix)unit-tests LOCAL_MODULE_TAGS := $(test_tags) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(test_c_flags) LOCAL_SHARED_LIBRARIES := liblog 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) include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_MODULE := sync-unit-tests -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += -g -Wall -Werror -std=gnu++11 -Wno-missing-field-initializers -Wno-sign-compare LOCAL_SHARED_LIBRARIES += libsync 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 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := libutils_tests 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) source_files := zip_archive.cc include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := ${source_files} LOCAL_STATIC_LIBRARIES := libz @@ -29,7 +28,6 @@ LOCAL_CPPFLAGS := -Wold-style-cast include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := ${source_files} LOCAL_STATIC_LIBRARIES := libz libutils @@ -42,7 +40,6 @@ LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := ${source_files} LOCAL_STATIC_LIBRARIES := libz libutils @@ -54,7 +51,6 @@ include $(BUILD_HOST_SHARED_LIBRARY) # Tests. include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := ziparchive-tests LOCAL_CPP_EXTENSION := .cc LOCAL_CFLAGS := -Werror @@ -64,7 +60,6 @@ LOCAL_STATIC_LIBRARIES := libziparchive libz libutils include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE := ziparchive-tests-host LOCAL_CPP_EXTENSION := .cc 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 := \ include $(CLEAR_VARS) LOCAL_MODULE := $(test_module_prefix)benchmarks LOCAL_MODULE_TAGS := $(test_tags) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(test_c_flags) LOCAL_SRC_FILES := $(benchmark_src_files) include $(BUILD_NATIVE_TEST) @@ -56,7 +55,6 @@ test_src_files := \ include $(CLEAR_VARS) LOCAL_MODULE := $(test_module_prefix)unit-tests LOCAL_MODULE_TAGS := $(test_tags) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(test_c_flags) LOCAL_SHARED_LIBRARIES := liblog 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 := \ include $(CLEAR_VARS) LOCAL_MODULE := $(test_module_prefix)unit-tests LOCAL_MODULE_TAGS := $(test_tags) -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(test_c_flags) LOCAL_SHARED_LIBRARIES := libcutils 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 := \ upstream-netbsd/lib/libutil/raise_default_signal.c LOCAL_CFLAGS += $(common_cflags) -Dmain=dd_main -DNO_CONV LOCAL_MODULE := libtoolbox_dd -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := upstream-netbsd/usr.bin/du/du.c LOCAL_CFLAGS += $(common_cflags) -Dmain=du_main LOCAL_MODULE := libtoolbox_du -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) @@ -82,7 +80,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS)) LOCAL_MODULE := toolbox -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk # Install the symlinks. 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 LOCAL_CFLAGS += $(common_cflags) LOCAL_MODULE := r LOCAL_MODULE_TAGS := debug -LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include $(BUILD_EXECUTABLE) -- cgit v1.2.3