LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad automatic dependency computations

Browse Source
This commit is contained in:
David 'Digit' Turner
2009-05-14 17:16:32 +02:00
parent ba7de1f325
commit c39a26b6f5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ndk/build/core/build-binary.mk
View File

@@ -120,5 +120,5 @@ $(foreach src,$(c_sources), $(call compile-c-source,$(src)))
$(foreach src,$(s_sources), $(call compile-s-source,$(src))) $(foreach src,$(s_sources), $(call compile-s-source,$(src)))
$(foreach src,$(cpp_sources), $(call compile-cpp-source,$(src))) $(foreach src,$(cpp_sources), $(call compile-cpp-source,$(src)))
LOCAL_DEPENDENCY_DIRS := $(sort $(LOCAL_DEPENDENCY_DIRS)) ALL_DEPENDENCY_DIRS += $(sort $(LOCAL_DEPENDENCY_DIRS))
CLEAN_OBJS_DIRS += $(LOCAL_OBJS_DIR) CLEAN_OBJS_DIRS += $(LOCAL_OBJS_DIR)

6
ndk/build/core/main.mk
View File

@@ -222,7 +222,7 @@ ANDROID_MK_INCLUDED := \
# generated during the build. It will be updated by build scripts # generated during the build. It will be updated by build scripts
# when module definitions are parsed. # when module definitions are parsed.
# #
DEPENDENCY_DIRS := ALL_DEPENDENCY_DIRS :=
# this is the list of all generated files that we would need to clean # this is the list of all generated files that we would need to clean
ALL_HOST_EXECUTABLES := ALL_HOST_EXECUTABLES :=
@@ -290,5 +290,5 @@ clean-config:
$(hide) rm -f $(CONFIG_MAKE) $(CONFIG_H) $(hide) rm -f $(CONFIG_MAKE) $(CONFIG_H)
# include dependency information # include dependency information
DEPENDENCY_DIRS := $(sort $(DEPENDENCY_DIRS)) ALL_DEPENDENCY_DIRS := $(sort $(ALL_DEPENDENCY_DIRS))
-include $(wildcard $(DEPENDENCY_DIRS:%=%/*.d)) -include $(wildcard $(ALL_DEPENDENCY_DIRS:%=%/*.d))