p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove USE_NINJA=false" 

am: 3bfc095f53

* commit '3bfc095f5373ca1756923f8aacdebdadc8ebd4ea':
  Remove USE_NINJA=false
This commit is contained in:
Dan Willemsen 2016-02-29 22:17:29 +00:00 committed by android-build-merger
parent 7cf7bc0956 3bfc095f53
commit d73633c082
15 changed files with 17 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/base_rules.mk
View File

@ -56,7 +56,6 @@ ifeq ($(my_host_cross),true)
my_module_tags := my_module_tags :=
endif endif
ifdef BUILDING_WITH_NINJA
# Ninja has an implicit dependency on the command being run, and kati will # Ninja has an implicit dependency on the command being run, and kati will
# regenerate the ninja manifest if any read makefile changes, so there is no # regenerate the ninja manifest if any read makefile changes, so there is no
# need to have dependencies on makefiles. # need to have dependencies on makefiles.
@ -64,7 +63,6 @@ ifdef BUILDING_WITH_NINJA
# a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't include # a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't include
# base_rules.mk, but it will fix the most common ones. # base_rules.mk, but it will fix the most common ones.
LOCAL_ADDITIONAL_DEPENDENCIES := $(filter-out %.mk,$(LOCAL_ADDITIONAL_DEPENDENCIES)) LOCAL_ADDITIONAL_DEPENDENCIES := $(filter-out %.mk,$(LOCAL_ADDITIONAL_DEPENDENCIES))
endif
########################################################### ###########################################################
## Validate and define fallbacks for input LOCAL_* variables. ## Validate and define fallbacks for input LOCAL_* variables.

14
core/binary.mk
View File

@ -53,7 +53,7 @@ my_cxx_wrapper := $(CXX_WRAPPER)
my_c_includes := $(LOCAL_C_INCLUDES) my_c_includes := $(LOCAL_C_INCLUDES)
my_generated_sources := $(LOCAL_GENERATED_SOURCES) my_generated_sources := $(LOCAL_GENERATED_SOURCES)
my_native_coverage := $(LOCAL_NATIVE_COVERAGE) my_native_coverage := $(LOCAL_NATIVE_COVERAGE)
my_additional_dependencies := $(LOCAL_MODULE_MAKEFILE_DEP) $(LOCAL_ADDITIONAL_DEPENDENCIES) my_additional_dependencies := $(LOCAL_ADDITIONAL_DEPENDENCIES)
my_export_c_include_dirs := $(LOCAL_EXPORT_C_INCLUDE_DIRS) my_export_c_include_dirs := $(LOCAL_EXPORT_C_INCLUDE_DIRS)
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE
@ -1143,7 +1143,7 @@ import_includes_deps := $(strip \
$(foreach l, $(my_static_libraries) $(my_whole_static_libraries), \ $(foreach l, $(my_static_libraries) $(my_whole_static_libraries), \
$(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes)) $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes))
$(import_includes): PRIVATE_IMPORT_EXPORT_INCLUDES := $(import_includes_deps) $(import_includes): PRIVATE_IMPORT_EXPORT_INCLUDES := $(import_includes_deps)
$(import_includes) : $(LOCAL_MODULE_MAKEFILE_DEP) $(import_includes_deps) $(import_includes) : $(import_includes_deps)
@echo Import includes file: $@ @echo Import includes file: $@
$(hide) mkdir -p $(dir $@) && rm -f $@ $(hide) mkdir -p $(dir $@) && rm -f $@
ifdef import_includes_deps ifdef import_includes_deps
@ -1210,11 +1210,7 @@ endif
# that custom build rules which generate .o files don't consume other generated # that custom build rules which generate .o files don't consume other generated
# sources as input (or if they do they take care of that dependency themselves). # sources as input (or if they do they take care of that dependency themselves).
$(normal_objects) : | $(my_generated_sources) $(normal_objects) : | $(my_generated_sources)
ifeq ($(BUILDING_WITH_NINJA),true)
$(all_objects) : $(import_includes) $(all_objects) : $(import_includes)
else
$(all_objects) : | $(import_includes)
endif
ALL_C_CPP_ETC_OBJECTS += $(all_objects) ALL_C_CPP_ETC_OBJECTS += $(all_objects)
@ -1406,7 +1402,7 @@ $(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(my_export_c_include_dirs)
# Similarly, the generated DBus headers need to exist before we export their location. # Similarly, the generated DBus headers need to exist before we export their location.
# People are not going to consume the aidl generated cpp file, but the cpp file is # People are not going to consume the aidl generated cpp file, but the cpp file is
# generated after the headers, so this is a convenient way to ensure the headers exist. # generated after the headers, so this is a convenient way to ensure the headers exist.
$(export_includes) : $(LOCAL_MODULE_MAKEFILE_DEP) $(proto_generated_headers) $(dbus_generated_headers) $(aidl_gen_cpp) $(export_includes) : $(proto_generated_headers) $(dbus_generated_headers) $(aidl_gen_cpp)
@echo Export includes file: $< -- $@ @echo Export includes file: $< -- $@
$(hide) mkdir -p $(dir $@) && rm -f $@.tmp $(hide) mkdir -p $(dir $@) && rm -f $@.tmp
ifdef my_export_c_include_dirs ifdef my_export_c_include_dirs
@ -1416,15 +1412,11 @@ ifdef my_export_c_include_dirs
else else
$(hide) touch $@.tmp $(hide) touch $@.tmp
endif endif
ifeq ($(BUILDING_WITH_NINJA),true)
$(hide) if cmp -s $@.tmp $@ ; then \ $(hide) if cmp -s $@.tmp $@ ; then \
rm $@.tmp ; \ rm $@.tmp ; \
else \ else \
mv $@.tmp $@ ; \ mv $@.tmp $@ ; \
fi fi
else
mv $@.tmp $@ ;
endif
# Kati adds restat=1 to ninja. GNU make does nothing for this. # Kati adds restat=1 to ninja. GNU make does nothing for this.
.KATI_RESTAT: $(export_includes) .KATI_RESTAT: $(export_includes)

17
core/definitions.mk
View File

@ -133,7 +133,6 @@ endef
define my-dir define my-dir
$(strip \ $(strip \
$(eval LOCAL_MODULE_MAKEFILE := $$(lastword $$(MAKEFILE_LIST))) \ $(eval LOCAL_MODULE_MAKEFILE := $$(lastword $$(MAKEFILE_LIST))) \
$(eval LOCAL_MODULE_MAKEFILE_DEP := $(if $(BUILDING_WITH_NINJA),,$$(LOCAL_MODULE_MAKEFILE))) \
$(if $(filter $(BUILD_SYSTEM)/% $(OUT_DIR)/%,$(LOCAL_MODULE_MAKEFILE)), \ $(if $(filter $(BUILD_SYSTEM)/% $(OUT_DIR)/%,$(LOCAL_MODULE_MAKEFILE)), \
$(error my-dir must be called before including any other makefile.) \ $(error my-dir must be called before including any other makefile.) \
, \ , \
@ -895,15 +894,9 @@ endef
########################################################### ###########################################################
# $(1): the .P file # $(1): the .P file
# $(2): the main build target # $(2): the main build target
ifeq ($(BUILDING_WITH_NINJA),true)
define include-depfile define include-depfile
$(eval $(2) : .KATI_DEPFILE := $1) $(eval $(2) : .KATI_DEPFILE := $1)
endef endef
else
define include-depfile
$(eval -include $1)
endef
endif
########################################################### ###########################################################
## Track source files compiled to objects ## Track source files compiled to objects
@ -2025,9 +2018,7 @@ endef
# Moves $1.tmp to $1 if necessary. This is designed to be used with # Moves $1.tmp to $1 if necessary. This is designed to be used with
# .KATI_RESTAT. For kati, this function doesn't update the timestamp # .KATI_RESTAT. For kati, this function doesn't update the timestamp
# of $1 when $1.tmp is identical to $1 so that ninja won't rebuild # of $1 when $1.tmp is identical to $1 so that ninja won't rebuild
# targets which depend on $1. For GNU make, this function simply # targets which depend on $1.
# copies $1.tmp to $1.
ifeq ($(BUILDING_WITH_NINJA),true)
define commit-change-for-toc define commit-change-for-toc
$(hide) if cmp -s $1.tmp $1 ; then \ $(hide) if cmp -s $1.tmp $1 ; then \
rm $1.tmp ; \ rm $1.tmp ; \
@ -2035,12 +2026,6 @@ else \
mv $1.tmp $1 ; \ mv $1.tmp $1 ; \
fi fi
endef endef
else
define commit-change-for-toc
@# make doesn't support restat. We always update .toc files so the dependents will always be updated too.
$(hide) mv $1.tmp $1
endef
endif
## Rule to create a table of contents from a .jar file. ## Rule to create a table of contents from a .jar file.
## Must be called with $(eval). ## Must be called with $(eval).

1
core/droiddoc.mk
View File

@ -161,7 +161,6 @@ $(full_target): \
$(droiddoc) \ $(droiddoc) \
$(html_dir_files) \ $(html_dir_files) \
$(full_java_lib_deps) \ $(full_java_lib_deps) \
$(LOCAL_MODULE_MAKEFILE_DEP) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)
@echo Docs droiddoc: $(PRIVATE_OUT_DIR) @echo Docs droiddoc: $(PRIVATE_OUT_DIR)
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)

2
core/executable_prefer_symlink.mk
View File

@ -42,7 +42,7 @@ endif
# $(my_symlink) doesn't need to depend on $(PRIVATE_SRC_BINARY_NAME): we can generate symlink to nonexistent file. # $(my_symlink) doesn't need to depend on $(PRIVATE_SRC_BINARY_NAME): we can generate symlink to nonexistent file.
# If you add the dependency, make would compare the timestamp of a file against that of its symlink: # If you add the dependency, make would compare the timestamp of a file against that of its symlink:
# they are always equal, because make follows symlink. # they are always equal, because make follows symlink.
$(my_symlink): $(LOCAL_MODULE_MAKEFILE_DEP) $(my_symlink):
@echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)" @echo "Symlink: $@ -> $(PRIVATE_SRC_BINARY_NAME)"
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
@rm -rf $@ @rm -rf $@

10
core/goma.mk
View File

@ -16,16 +16,6 @@
# Notice: this works only with Google's Goma build infrastructure. # Notice: this works only with Google's Goma build infrastructure.
ifneq ($(filter-out false,$(USE_GOMA)),) ifneq ($(filter-out false,$(USE_GOMA)),)
# Check if USE_NINJA is not false because GNU make won't work well
# with goma. Note this file is evaluated twice, once by GNU make and
# once by kati with USE_NINJA=false. We do this check in the former
# pass.
ifndef KATI
ifeq ($(USE_NINJA),false)
$(error USE_GOMA=true is not compatible with USE_NINJA=false)
endif
endif
# Goma requires a lot of processes and file descriptors. # Goma requires a lot of processes and file descriptors.
ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1) ifeq ($(shell echo $$(($$(ulimit -u) < 2500 || $$(ulimit -n) < 16000))),1)
$(warning Max user processes and/or open files are insufficient) $(warning Max user processes and/or open files are insufficient)

3
core/host_dalvik_java_library.mk
View File

@ -76,7 +76,6 @@ $(full_classes_compiled_jar): \
$(full_java_lib_deps) \ $(full_java_lib_deps) \
$(jar_manifest_file) \ $(jar_manifest_file) \
$(proto_java_sources_file_stamp) \ $(proto_java_sources_file_stamp) \
$(LOCAL_MODULE_MAKEFILE_DEP) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-host-java-to-package) $(transform-host-java-to-package)
@ -126,7 +125,7 @@ $(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)
$(built_dex): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLAGS) $(built_dex): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JACK_FLAGS)
$(built_dex): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION) $(built_dex): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)
$(built_dex): $(java_sources) $(java_resource_sources) $(full_jack_deps) \ $(built_dex): $(java_sources) $(java_resource_sources) $(full_jack_deps) \
$(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_MODULE_MAKEFILE_DEP) \ $(jar_manifest_file) $(proto_java_sources_file_stamp) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK) | setup-jack-server $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK) | setup-jack-server
@echo Building with Jack: $@ @echo Building with Jack: $@
$(jack-java-to-dex) $(jack-java-to-dex)

2
core/host_dalvik_static_java_library.mk
View File

@ -48,7 +48,7 @@ $(full_classes_jack): \
PRIVATE_JACK_INCREMENTAL_DIR := PRIVATE_JACK_INCREMENTAL_DIR :=
endif endif
$(full_classes_jack): $(java_sources) $(java_resource_sources) $(full_jack_deps) \ $(full_classes_jack): $(java_sources) $(java_resource_sources) $(full_jack_deps) \
$(jar_manifest_file) $(layers_file) $(LOCAL_MODULE_MAKEFILE_DEP) \ $(jar_manifest_file) $(layers_file) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \ $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \
$(JACK) | setup-jack-server $(JACK) | setup-jack-server
@echo Building with Jack: $@ @echo Building with Jack: $@

1
core/host_java_library.mk
View File

@ -88,6 +88,5 @@ $(full_classes_compiled_jar): \
$(full_java_lib_deps) \ $(full_java_lib_deps) \
$(jar_manifest_file) \ $(jar_manifest_file) \
$(proto_java_sources_file_stamp) \ $(proto_java_sources_file_stamp) \
$(LOCAL_MODULE_MAKEFILE_DEP) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-host-java-to-package) $(transform-host-java-to-package)

1
core/host_shared_library_internal.mk
View File

@ -44,7 +44,6 @@ $(LOCAL_BUILD_MODULE): PRIVATE_HOST_LIBPROFILE_RT := $(my_host_libprofile_rt)
$(LOCAL_BUILT_MODULE): \ $(LOCAL_BUILT_MODULE): \
$(all_objects) \ $(all_objects) \
$(all_libraries) \ $(all_libraries) \
$(LOCAL_MODULE_MAKEFILE_DEP) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-host-o-to-shared-lib) $(transform-host-o-to-shared-lib)

4
core/java.mk
View File

@ -304,7 +304,6 @@ $(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_
$(aidl_java_sources): $(intermediates.COMMON)/src/%.java: \ $(aidl_java_sources): $(intermediates.COMMON)/src/%.java: \
$(LOCAL_PATH)/%.aidl \ $(LOCAL_PATH)/%.aidl \
$(LOCAL_MODULE_MAKEFILE_DEP) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) \ $(LOCAL_ADDITIONAL_DEPENDENCIES) \
$(AIDL) \ $(AIDL) \
$(aidl_preprocess_import) $(aidl_preprocess_import)
@ -413,7 +412,6 @@ $(full_classes_compiled_jar): \
$(layers_file) \ $(layers_file) \
$(RenderScript_file_stamp) \ $(RenderScript_file_stamp) \
$(proto_java_sources_file_stamp) \ $(proto_java_sources_file_stamp) \
$(LOCAL_MODULE_MAKEFILE_DEP) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-java-to-classes.jar) $(transform-java-to-classes.jar)
@ -665,7 +663,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)
jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \ jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_deps) \
$(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) $(proguard_flag_files) \ $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) $(proguard_flag_files) \
$(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \ $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \
$(LOCAL_MODULE_MAKEFILE_DEP) $(JACK) $(JACK)
ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true) ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
$(full_classes_jack): $(jack_all_deps) | setup-jack-server $(full_classes_jack): $(jack_all_deps) | setup-jack-server

17
core/main.mk
View File

@ -96,22 +96,15 @@ include $(BUILD_SYSTEM)/help.mk
# and host information. # and host information.
include $(BUILD_SYSTEM)/config.mk include $(BUILD_SYSTEM)/config.mk
relaunch_with_ninja := ifndef KATI
ifneq ($(USE_NINJA),false) ifdef USE_NINJA
ifndef BUILDING_WITH_NINJA $(warning USE_NINJA is ignored. Ninja is always used.)
relaunch_with_ninja := true
endif
endif endif
ifeq ($(relaunch_with_ninja),true)
# Mark this is a ninja build. # Mark this is a ninja build.
$(shell mkdir -p $(OUT_DIR) && touch $(OUT_DIR)/ninja_build) $(shell mkdir -p $(OUT_DIR) && touch $(OUT_DIR)/ninja_build)
include build/core/ninja.mk include build/core/ninja.mk
else # !relaunch_with_ninja else # KATI
ifndef BUILDING_WITH_NINJA
# Remove ninja build mark if it exists.
$(shell rm -f $(OUT_DIR)/ninja_build)
endif
# With these files findleaves.py won't be unnecessarily slower even if # With these files findleaves.py won't be unnecessarily slower even if
# there is a user creates a copy of $(OUT_DIR). # there is a user creates a copy of $(OUT_DIR).
@ -1120,4 +1113,4 @@ showcommands:
.PHONY: nothing .PHONY: nothing
nothing: nothing:
@echo Successfully read the makefiles. @echo Successfully read the makefiles.
endif # !relaunch_with_ninja endif # KATI

2
core/phony_package.mk
View File

@ -7,7 +7,7 @@ LOCAL_MODULE_SUFFIX := -timestamp
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE): $(LOCAL_MODULE_MAKEFILE_DEP) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(hide) echo "Fake: $@" $(hide) echo "Fake: $@"
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) touch $@ $(hide) touch $@

6
core/prebuilt_internal.mk
View File

@ -95,7 +95,7 @@ else # LOCAL_STRIP_MODULE and LOCAL_PACK_MODULE_RELOCATIONS not true
ifdef prebuilt_module_is_a_library ifdef prebuilt_module_is_a_library
export_includes := $(intermediates)/export_includes export_includes := $(intermediates)/export_includes
$(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(LOCAL_EXPORT_C_INCLUDE_DIRS) $(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(LOCAL_EXPORT_C_INCLUDE_DIRS)
$(export_includes) : $(LOCAL_MODULE_MAKEFILE_DEP) $(export_includes) :
@echo Export includes file: $< -- $@ @echo Export includes file: $< -- $@
$(hide) mkdir -p $(dir $@) && rm -f $@ $(hide) mkdir -p $(dir $@) && rm -f $@
ifdef LOCAL_EXPORT_C_INCLUDE_DIRS ifdef LOCAL_EXPORT_C_INCLUDE_DIRS
@ -330,7 +330,7 @@ endif
# We may be building classes.jack from a host jar for host dalvik Java library. # We may be building classes.jack from a host jar for host dalvik Java library.
$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS) $(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS)
$(intermediates.COMMON)/classes.jack : $(my_src_jar) $(LOCAL_MODULE_MAKEFILE_DEP) \ $(intermediates.COMMON)/classes.jack : $(my_src_jar) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK) | setup-jack-server $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK) | setup-jack-server
$(transform-jar-to-jack) $(transform-jar-to-jack)
@ -341,6 +341,6 @@ $(intermediates.COMMON)/classes.dex.toc: $(intermediates.COMMON)/classes.jack
endif # JAVA_LIBRARIES endif # JAVA_LIBRARIES
$(built_module) : $(LOCAL_MODULE_MAKEFILE_DEP) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES)
my_prebuilt_src_file := my_prebuilt_src_file :=

1
core/shared_library_internal.mk
View File

@ -76,7 +76,6 @@ $(linked_module): \
$(all_libraries) \ $(all_libraries) \
$(my_target_crtbegin_so_o) \ $(my_target_crtbegin_so_o) \
$(my_target_crtend_so_o) \ $(my_target_crtend_so_o) \
$(LOCAL_MODULE_MAKEFILE_DEP) \
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)
$(transform-o-to-shared-lib) $(transform-o-to-shared-lib)