tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/core/ninja.mk

162 lines
4.9 KiB
Makefile
Raw Normal View History

Update prebuilt build tools path Build tools have been moved from prebuilts/sdk/tools to prebuilts/build-tools. Bug: 27857138 Change-Id: I60be42c197d420897dab77808c25818c9d2e81df
2016-04-20 00:32:22 +02:00
NINJA ?= prebuilts/build-tools/$(HOST_PREBUILT_TAG)/bin/ninja
Allow building kati & makeparallel with soong This uses far fewer hacks in order to build these host tools, but will require more libraries(libc++,etc) from unbundled and stripped down branches. Once this becomes the only option, all builds will happen after soong runs. Then the toolchain / global cflags information will be able to be moved from make to soong (and exported back to make). Change-Id: I270b1d92bcef28a96fbc3ec9910d9bd0c101ac0f
2016-01-07 01:00:00 +01:00
include $(BUILD_SYSTEM)/soong.mk
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
Move ninja files to $(OUT_DIR) Move the ninja files from $(PRODUCT_OUT)/build.ninja to $(OUT_DIR)/build-$(TARGET_PRODUCT).ninja. This will improve incremental builds of host modules after swithing target products, because the .ninja_deps file will be accurate across builds. Change-Id: Ia12746ccde0de31f6fccd111b2bdbd48fc6900d7
2015-09-30 06:37:40 +02:00
KATI_OUTPUT_PATTERNS := $(OUT_DIR)/build%.ninja $(OUT_DIR)/ninja%.sh
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS. ANDROID_GOALS: any Android goals that need to be built. KATI_GOALS: goals that we need to pass to Kati. NINJA_GOALS: goals we need to pass to Ninja. For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS), we don't need to pass them to Ninja. See also commit 80e46c7c5cb7b1d80114876d301798a8624b4200. Restore the dist rule removed by the above commit. Previously "droid" was never passed to Ninja. That's incorrect. "make droid docs" should build both docs and droiod. Fixed with this change. Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
2015-10-28 20:34:03 +01:00
# Modifier goals we don't need to pass to Ninja.
NINJA_EXCLUDE_GOALS := showcommands all dist
.PHONY : $(NINJA_EXCLUDE_GOALS)
# A list of goals which affect parsing of makefiles and we need to pass to Kati.
Use the same build.ninja for normal make targets $(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))). If the make targets contain one of them, we keep using a different build.ninja for each combination of make targets. Otherwise, we use the same build.ninja which has all phony targets. Also load vendor/google/build/ninja_config.mk so it can add Google-specific goals to $(PARSE_TIME_MAKE_GOALS). Bug: 23685536 Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
2015-09-04 07:38:37 +02:00
PARSE_TIME_MAKE_GOALS := \
$(PARSE_TIME_MAKE_GOALS) \
$(dont_bother_goals) \
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS. ANDROID_GOALS: any Android goals that need to be built. KATI_GOALS: goals that we need to pass to Kati. NINJA_GOALS: goals we need to pass to Ninja. For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS), we don't need to pass them to Ninja. See also commit 80e46c7c5cb7b1d80114876d301798a8624b4200. Restore the dist rule removed by the above commit. Previously "droid" was never passed to Ninja. That's incorrect. "make droid docs" should build both docs and droiod. Fixed with this change. Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
2015-10-28 20:34:03 +01:00
all \
Use the same build.ninja for normal make targets $(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))). If the make targets contain one of them, we keep using a different build.ninja for each combination of make targets. Otherwise, we use the same build.ninja which has all phony targets. Also load vendor/google/build/ninja_config.mk so it can add Google-specific goals to $(PARSE_TIME_MAKE_GOALS). Bug: 23685536 Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
2015-09-04 07:38:37 +02:00
APP-% \
DUMP_% \
ECLIPSE-% \
PRODUCT-% \
introduce AUX build class of targets AUX is a new class, similar to TARGET While TARGET defines toolchain for Application Processors AUX is defining toolchains for arbitrary utility cores (DSPs, GPUs, MCUs, etc). This allows building of non-android sources as part of Android tree and avoid using prebuilts if source code is avaliable Bug: 29635686 Change-Id: Ie755ea054b16c3e86369f5fb2ba6eb0b384af77f Signed-off-by: Alexey Polyudov <apolyudov@google.com>
2016-08-02 02:41:49 +02:00
AUX-% \
Use the same build.ninja for normal make targets $(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))). If the make targets contain one of them, we keep using a different build.ninja for each combination of make targets. Otherwise, we use the same build.ninja which has all phony targets. Also load vendor/google/build/ninja_config.mk so it can add Google-specific goals to $(PARSE_TIME_MAKE_GOALS). Bug: 23685536 Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
2015-09-04 07:38:37 +02:00
boottarball-nodeps \
Adding a brillo_tests task. Places whitelisted brillo tests and the whitelist itself in a zip when run. BUG: 27385399 Change-Id: I93c2ea8cc521292a6de811bb47bc87a727edd21f TEST: manual make dist brillo_tests, confirmed desired files were in zip.
2016-02-29 22:08:49 +01:00
brillo_tests \
Use the same build.ninja for normal make targets $(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))). If the make targets contain one of them, we keep using a different build.ninja for each combination of make targets. Otherwise, we use the same build.ninja which has all phony targets. Also load vendor/google/build/ninja_config.mk so it can add Google-specific goals to $(PARSE_TIME_MAKE_GOALS). Bug: 23685536 Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
2015-09-04 07:38:37 +02:00
btnod \
build-art% \
build_kernel-nodeps \
clean-oat% \
continuous_instrumentation_tests \
continuous_native_tests \
cts \
custom_images \
deps-license \
dicttool_aosp \
dist \
dump-products \
dumpvar-% \
eng \
fusion \
oem_image \
Support build old version of cts Bug: 27508747 Change-Id: I3d474f6f6534e172ecf1d0a6c833a9dfa6164344
2016-03-05 13:05:49 +01:00
old-cts \
Use the same build.ninja for normal make targets $(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))). If the make targets contain one of them, we keep using a different build.ninja for each combination of make targets. Otherwise, we use the same build.ninja which has all phony targets. Also load vendor/google/build/ninja_config.mk so it can add Google-specific goals to $(PARSE_TIME_MAKE_GOALS). Bug: 23685536 Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
2015-09-04 07:38:37 +02:00
online-system-api-sdk-docs \
pdk \
platform \
platform-java \
product-graph \
samplecode \
sdk \
sdk_addon \
sdk_repo \
snod \
stnod \
systemimage-nodeps \
systemtarball-nodeps \
target-files-package \
test-art% \
user \
userdataimage \
userdebug \
valgrind-test-art% \
Add vts to build in ninja Bug: 27687012 Change-Id: Icb94e3eee71a8f54f13f868fa2461b2063e7ca6d
2016-04-01 16:39:48 +02:00
vts \
Use the same build.ninja for normal make targets $(PARSE_TIME_MAKE_GOALS) is a list of known goals which affect parsing of make (e.g., there is $(filter XXX,$(MAKECMDGOALS))). If the make targets contain one of them, we keep using a different build.ninja for each combination of make targets. Otherwise, we use the same build.ninja which has all phony targets. Also load vendor/google/build/ninja_config.mk so it can add Google-specific goals to $(PARSE_TIME_MAKE_GOALS). Bug: 23685536 Change-Id: I3da5c76fa7644a05a55c374a754212f4fb794818
2015-09-04 07:38:37 +02:00
win_sdk \
winsdk-tools
-include vendor/google/build/ninja_config.mk
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS. ANDROID_GOALS: any Android goals that need to be built. KATI_GOALS: goals that we need to pass to Kati. NINJA_GOALS: goals we need to pass to Ninja. For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS), we don't need to pass them to Ninja. See also commit 80e46c7c5cb7b1d80114876d301798a8624b4200. Restore the dist rule removed by the above commit. Previously "droid" was never passed to Ninja. That's incorrect. "make droid docs" should build both docs and droiod. Fixed with this change. Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
2015-10-28 20:34:03 +01:00
# Any Android goals that need to be built.
Use hermetic ckati/makeparallel prebuilts Currently, we're building against the native host version of libc++ and other headers. Instead, use prebuilts of ckati/makeparallel built with Soong against the included libc++ and sysroot. Building ckati / makeparallel doesn't work well in unbundled branches that don't have all of the libc++ dependencies to do successful host builds. KATI is default variable defined when running under Kati, don't use it for other purposes. Use CKATI instead. Bug: 27533820 Change-Id: I82d66f5e34e3341a3cee4c5c83cd1d9a54d057ff
2016-03-08 20:12:40 +01:00
ANDROID_GOALS := $(filter-out $(KATI_OUTPUT_PATTERNS) $(CKATI) $(MAKEPARALLEL),\
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS. ANDROID_GOALS: any Android goals that need to be built. KATI_GOALS: goals that we need to pass to Kati. NINJA_GOALS: goals we need to pass to Ninja. For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS), we don't need to pass them to Ninja. See also commit 80e46c7c5cb7b1d80114876d301798a8624b4200. Restore the dist rule removed by the above commit. Previously "droid" was never passed to Ninja. That's incorrect. "make droid docs" should build both docs and droiod. Fixed with this change. Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
2015-10-28 20:34:03 +01:00
$(sort $(ORIGINAL_MAKECMDGOALS) $(MAKECMDGOALS)))
# Goals we need to pass to Ninja.
NINJA_GOALS := $(filter-out $(NINJA_EXCLUDE_GOALS), $(ANDROID_GOALS))
# Goals we need to pass to Kati.
KATI_GOALS := $(filter $(PARSE_TIME_MAKE_GOALS), $(ANDROID_GOALS))
Set --ninja_suffix based on make/mm/mmm targets This fixes two issues: - Switching make target didn't work well when the latter make target is not a subset of the first make target. - Switching between m and mm/mmm forced build.ninja to be regenerated. Bug: 23685536 Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
2015-09-01 07:24:18 +02:00
Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix So that switching between two different mmma targets won't need regenerating ninja files. Change-Id: Ifddd75ec49abd3ab2a54c6afbb902b0b32359db8
2015-09-04 04:41:33 +02:00
define replace_space_and_slash
$(subst /,_,$(subst $(space),_,$(sort $1)))
endef
Move ninja files to $(OUT_DIR) Move the ninja files from $(PRODUCT_OUT)/build.ninja to $(OUT_DIR)/build-$(TARGET_PRODUCT).ninja. This will improve incremental builds of host modules after swithing target products, because the .ninja_deps file will be accurate across builds. Change-Id: Ia12746ccde0de31f6fccd111b2bdbd48fc6900d7
2015-09-30 06:37:40 +02:00
KATI_NINJA_SUFFIX := -$(TARGET_PRODUCT)
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS. ANDROID_GOALS: any Android goals that need to be built. KATI_GOALS: goals that we need to pass to Kati. NINJA_GOALS: goals we need to pass to Ninja. For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS), we don't need to pass them to Ninja. See also commit 80e46c7c5cb7b1d80114876d301798a8624b4200. Restore the dist rule removed by the above commit. Previously "droid" was never passed to Ninja. That's incorrect. "make droid docs" should build both docs and droiod. Fixed with this change. Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
2015-10-28 20:34:03 +01:00
ifneq ($(KATI_GOALS),)
KATI_NINJA_SUFFIX := $(KATI_NINJA_SUFFIX)-$(call replace_space_and_slash,$(KATI_GOALS))
Set --ninja_suffix based on make/mm/mmm targets This fixes two issues: - Switching make target didn't work well when the latter make target is not a subset of the first make target. - Switching between m and mm/mmm forced build.ninja to be regenerated. Bug: 23685536 Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
2015-09-01 07:24:18 +02:00
endif
ifneq ($(ONE_SHOT_MAKEFILE),)
Use $(BUILD_MODULES_IN_PATHS) as a part of ninja suffix So that switching between two different mmma targets won't need regenerating ninja files. Change-Id: Ifddd75ec49abd3ab2a54c6afbb902b0b32359db8
2015-09-04 04:41:33 +02:00
KATI_NINJA_SUFFIX := $(KATI_NINJA_SUFFIX)-mmm-$(call replace_space_and_slash,$(ONE_SHOT_MAKEFILE))
endif
Set --ninja_suffix based on make/mm/mmm targets This fixes two issues: - Switching make target didn't work well when the latter make target is not a subset of the first make target. - Switching between m and mm/mmm forced build.ninja to be regenerated. Bug: 23685536 Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
2015-09-01 07:24:18 +02:00
Use md5sum as the build.ninja filename suffix if the suffix gets too long. Use md5sum as the build.ninja filename suffix if the suffix is longer than 64 characters. Also store the original suffix in a corresponding .suf file for human lookup. This fixes the "File name too long" error when kati tries to write to build.ninja with the long original suffix. Bug: 24302576 Change-Id: Ie04b0c14e1a9d593aa5c2a6b357b19a9e8a7158e
2015-09-22 23:37:53 +02:00
my_checksum_suffix :=
my_ninja_suffix_too_long := $(filter 1, $(shell v='$(KATI_NINJA_SUFFIX)' && echo $$(($${$(pound)v} > 64))))
ifneq ($(my_ninja_suffix_too_long),)
# Replace the suffix with a checksum if it gets too long.
my_checksum_suffix := $(KATI_NINJA_SUFFIX)
KATI_NINJA_SUFFIX := -$(word 1, $(shell echo $(my_checksum_suffix) | $(MD5SUM)))
endif
Move ninja files to $(OUT_DIR) Move the ninja files from $(PRODUCT_OUT)/build.ninja to $(OUT_DIR)/build-$(TARGET_PRODUCT).ninja. This will improve incremental builds of host modules after swithing target products, because the .ninja_deps file will be accurate across builds. Change-Id: Ia12746ccde0de31f6fccd111b2bdbd48fc6900d7
2015-09-30 06:37:40 +02:00
KATI_BUILD_NINJA := $(OUT_DIR)/build$(KATI_NINJA_SUFFIX).ninja
Switch to using kati env script Kati generates a shell script to run ninja, but that makes it difficult to customize the ninja command line. Switch to sourcing the new env script and then starting ninja manually. Change-Id: I7139290a463018ddf5e05b4d61a0d2f18b1a2247
2015-11-09 23:21:12 +01:00
KATI_ENV_SH := $(OUT_DIR)/env$(KATI_NINJA_SUFFIX).sh
Use md5sum as the build.ninja filename suffix if the suffix gets too long. Use md5sum as the build.ninja filename suffix if the suffix is longer than 64 characters. Also store the original suffix in a corresponding .suf file for human lookup. This fixes the "File name too long" error when kati tries to write to build.ninja with the long original suffix. Bug: 24302576 Change-Id: Ie04b0c14e1a9d593aa5c2a6b357b19a9e8a7158e
2015-09-22 23:37:53 +02:00
# Write out a file mapping checksum to the real suffix.
ifneq ($(my_checksum_suffix),)
my_ninja_suffix_file := $(basename $(KATI_BUILD_NINJA)).suf
$(shell mkdir -p $(dir $(my_ninja_suffix_file)) && \
echo $(my_checksum_suffix) > $(my_ninja_suffix_file))
endif
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
ifeq (,$(NINJA_STATUS))
Update default NINJA_STATUS to show finished edges Update default NINJA_STATUS that includes percentage to match https://github.com/ninja-build/ninja/commit/6c2c2eecbfd2e4ddeeacb0129944618a6ce3dc4f Change-Id: I5694308abe26b71999d944c40962d59d50a73077
2016-05-31 21:38:04 +02:00
NINJA_STATUS := [%p %f/%t]$(space)
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
endif
Only pass NINJA_ARGS to the main ninja compile This way commands like "-t query <target>" will work against the main build, instead of failing to find the target during the initial soong build and stopping. Change-Id: I9b6bd6ac431b95e12db69ec7f272669b9d292761
2016-05-06 01:52:37 +02:00
NINJA_EXTRA_ARGS :=
Use unmodified MAKECMDGOALS in ninja.mk. The build system removes targets like "PRODUCT-full-eng" from MAKECMDGOALS in build/core/product_config.mk. Without this change, such target isn't passed to kati. Change-Id: I0b3949ed1f5557445d7f5d5bd59b7875c0b2ea7f
2015-07-29 02:57:45 +02:00
ifneq (,$(filter showcommands,$(ORIGINAL_MAKECMDGOALS)))
Only pass NINJA_ARGS to the main ninja compile This way commands like "-t query <target>" will work against the main build, instead of failing to find the target during the initial soong build and stopping. Change-Id: I9b6bd6ac431b95e12db69ec7f272669b9d292761
2016-05-06 01:52:37 +02:00
NINJA_EXTRA_ARGS += "-v"
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
endif
Make multiple rules to generate a file an error Pass -w dupbuild=err to ninja to make defining multiple rules to build a file an error instead of a warning. Proceeding with the build would result in undefined behavior, and nobody notices the warning. Change-Id: Iadac88f8835121a8685bff835acba638100bb654
2015-09-23 22:52:22 +02:00
# Make multiple rules to generate the same target an error instead of
# proceeding with undefined behavior.
Only pass NINJA_ARGS to the main ninja compile This way commands like "-t query <target>" will work against the main build, instead of failing to find the target during the initial soong build and stopping. Change-Id: I9b6bd6ac431b95e12db69ec7f272669b9d292761
2016-05-06 01:52:37 +02:00
NINJA_EXTRA_ARGS += -w dupbuild=err
Make multiple rules to generate a file an error Pass -w dupbuild=err to ninja to make defining multiple rules to build a file an error instead of a warning. Proceeding with the build would result in undefined behavior, and nobody notices the warning. Change-Id: Iadac88f8835121a8685bff835acba638100bb654
2015-09-23 22:52:22 +02:00
Make it possible to change the number of remote jobs User can overwrite NINJA_REMOTE_NUM_JOBS for this purpose. The number is passed to ninja instead of to kati so no we don't need to regenerate a ninja file when a user changes this value. Change-Id: I2ccfaaae4492d84a8b8045dff612cb5f6ebe2c79
2015-09-24 09:22:44 +02:00
ifdef USE_GOMA
Use makeparallel to propagate -j flag to ninja or kati When USE_NINJA=true is set, use makeparallel to claim all jobs from make and pass them to ninja with -j. If USE_GOMA is set, pass the -j flag to kati instead so the parallelism can be set in the local_pool instead. Change-Id: I6e4f957c65683b74533ecb6d33e25de858922823
2015-09-06 09:35:21 +02:00
KATI_MAKEPARALLEL := $(MAKEPARALLEL)
Make it possible to change the number of remote jobs User can overwrite NINJA_REMOTE_NUM_JOBS for this purpose. The number is passed to ninja instead of to kati so no we don't need to regenerate a ninja file when a user changes this value. Change-Id: I2ccfaaae4492d84a8b8045dff612cb5f6ebe2c79
2015-09-24 09:22:44 +02:00
# Ninja runs remote jobs (i.e., commands which contain gomacc) with
# this parallelism. Note the parallelism of all other jobs is still
# limited by the -j flag passed to GNU make.
NINJA_REMOTE_NUM_JOBS ?= 500
Only pass NINJA_ARGS to the main ninja compile This way commands like "-t query <target>" will work against the main build, instead of failing to find the target during the initial soong build and stopping. Change-Id: I9b6bd6ac431b95e12db69ec7f272669b9d292761
2016-05-06 01:52:37 +02:00
NINJA_EXTRA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS)
Use makeparallel to propagate -j flag to ninja or kati When USE_NINJA=true is set, use makeparallel to claim all jobs from make and pass them to ninja with -j. If USE_GOMA is set, pass the -j flag to kati instead so the parallelism can be set in the local_pool instead. Change-Id: I6e4f957c65683b74533ecb6d33e25de858922823
2015-09-06 09:35:21 +02:00
else
Pass --ninja to makeparallel for ninja When parallelism is being handled by ninja, pass --ninja to makeparallel to have it translate -j with no number to default ninja parallelism, and -k to -k0. Bug: 24199503 Change-Id: Ic1be7572f93b33e4a71ed23e9e73dea1d4255703
2015-09-18 23:54:40 +02:00
NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja
Use makeparallel to propagate -j flag to ninja or kati When USE_NINJA=true is set, use makeparallel to claim all jobs from make and pass them to ninja with -j. If USE_GOMA is set, pass the -j flag to kati instead so the parallelism can be set in the local_pool instead. Change-Id: I6e4f957c65683b74533ecb6d33e25de858922823
2015-09-06 09:35:21 +02:00
endif
Only pass NINJA_ARGS to the main ninja compile This way commands like "-t query <target>" will work against the main build, instead of failing to find the target during the initial soong build and stopping. Change-Id: I9b6bd6ac431b95e12db69ec7f272669b9d292761
2016-05-06 01:52:37 +02:00
NINJA_ARGS += $(NINJA_EXTRA_ARGS)
Combine soong builds into make builds Bootstrap soong if necessary, and wrap the kati and soong ninja files into a single ninja file. Change-Id: I0000c7eaa1adda763189681c57ec27a97a12ee1f
2015-11-09 23:53:36 +01:00
COMBINED_BUILD_NINJA := $(OUT_DIR)/combined$(KATI_NINJA_SUFFIX).ninja
Always run Soong Without switching on USE_SOONG, this lets us verify that all builds have blueprint/soong/go, and can generate a build.ninja file without producing errors. Change-Id: I79451ce24c8b5b6745e41d951153265441c33e8a
2016-03-11 00:03:41 +01:00
$(COMBINED_BUILD_NINJA): $(KATI_BUILD_NINJA)
Combine soong builds into make builds Bootstrap soong if necessary, and wrap the kati and soong ninja files into a single ninja file. Change-Id: I0000c7eaa1adda763189681c57ec27a97a12ee1f
2015-11-09 23:53:36 +01:00
$(hide) echo "builddir = $(OUT_DIR)" > $(COMBINED_BUILD_NINJA)
$(hide) echo "subninja $(SOONG_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
$(hide) echo "subninja $(KATI_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS. ANDROID_GOALS: any Android goals that need to be built. KATI_GOALS: goals that we need to pass to Kati. NINJA_GOALS: goals we need to pass to Ninja. For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS), we don't need to pass them to Ninja. See also commit 80e46c7c5cb7b1d80114876d301798a8624b4200. Restore the dist rule removed by the above commit. Previously "droid" was never passed to Ninja. That's incorrect. "make droid docs" should build both docs and droiod. Fixed with this change. Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
2015-10-28 20:34:03 +01:00
$(sort $(DEFAULT_GOAL) $(ANDROID_GOALS)) : ninja_wrapper
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
@#empty
Remove use of .INTERMEDIATE make 3.81 has a bug where combining an up-to-date .INTERMEDIATE rule with -j causes an infinite loop (http://savannah.gnu.org/bugs/?15919). .INTERMEDIATE was only necessary to support multiple outputs while only running a command once, remove .INTERMEDIATE by replacing $(KATI_OUTPUTS) dependencies with $(KATI_BUILD_NINJA). We can assume that $(KATI_NINJA_SH) will be updated at the same time as $(KATI_BUILD_NINJA), and not explicitly depend on it. Also remove generateonly and fastincremental, which are no longer necessary and were overcomplicating ninja.mk. kati now always runs due to FORCE, and ninja is run by a phony rule that depends on $(KATI_BUILD_NINJA). Bug: 25344116 Change-Id: I99d2713b1532ea11d83da9a11b1be26cfe13a5d2
2015-10-28 21:28:11 +01:00
.PHONY: ninja_wrapper
Combine soong builds into make builds Bootstrap soong if necessary, and wrap the kati and soong ninja files into a single ninja file. Change-Id: I0000c7eaa1adda763189681c57ec27a97a12ee1f
2015-11-09 23:53:36 +01:00
ninja_wrapper: $(COMBINED_BUILD_NINJA) $(MAKEPARALLEL)
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
@echo Starting build with ninja
Remove -d keepdepfile from ninja command line DO NOT MERGE keepdepfile is not supported by the ninja prebuilt in nyc-dev. Bug: 27886012 Change-Id: Ia4f0b15916618b1b7caa2abb53e25f87737b5288
2016-03-29 19:47:51 +02:00
+$(hide) export NINJA_STATUS="$(NINJA_STATUS)" && source $(KATI_ENV_SH) && $(NINJA_MAKEPARALLEL) $(NINJA) $(NINJA_GOALS) -C $(TOP) -f $(COMBINED_BUILD_NINJA) $(NINJA_ARGS)
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
Handle symlinked OUT_DIRs (again) My previous attempt at properly handling symlinked OUT_DIRs only worked if the symlink was to a different directory, not one in the same directory. This time, make sure that both make and soong use the same representation of the output directory by passing BUILDDIR to bootstrap.bash. Soong has been updated to pick whether to use a relative or absolute path back to the source tree depending on what makes sense. If the BUILDDIR or the path back to the source tree change, re-run the bootstrap. Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation to before Kati runs. In the case that $TOP/out was symlinked to $TOP/out.angler: 1) Soong generates out.angler/soong/Android.mk 2) Kati's find generator produces in-memory tree of the filesystem 3) $(shell ) creates out.angler/Android.mk 4) The emulated findleaves Android.mk search finds out.angler/soong/Android.mk since the in-memory tree is never updated. This doesn't happen in the normal case, because we pass --prune=$OUT_DIR to findleaves. Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
2016-03-22 22:44:17 +01:00
# Dummy Android.mk and CleanSpec.mk files so that kati won't recurse into the
# out directory
DUMMY_OUT_MKS := $(OUT_DIR)/Android.mk $(OUT_DIR)/CleanSpec.mk
$(DUMMY_OUT_MKS):
@mkdir -p $(dir $@)
$(hide) echo '# This file prevents findleaves.py from traversing this directory further' >$@
envsetup,product,ninja: enable symlink traversal When searching device, product, or hardware, allow find to follow symlinks. Add KATI_EMULATE_FIND=false to allow disabling the find emulator which changes findleaves.py behavior wrt symlinks. BUG=24605247 TEST=works with CL:783781 (without the find wrapper in that CL) Change-Id: Ia9d0e4add391a56f34828a09a6cec3f435ccc548
2015-10-07 04:40:11 +02:00
KATI_FIND_EMULATOR := --use_find_emulator
ifeq ($(KATI_EMULATE_FIND),false)
KATI_FIND_EMULATOR :=
endif
Handle symlinked OUT_DIRs (again) My previous attempt at properly handling symlinked OUT_DIRs only worked if the symlink was to a different directory, not one in the same directory. This time, make sure that both make and soong use the same representation of the output directory by passing BUILDDIR to bootstrap.bash. Soong has been updated to pick whether to use a relative or absolute path back to the source tree depending on what makes sense. If the BUILDDIR or the path back to the source tree change, re-run the bootstrap. Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation to before Kati runs. In the case that $TOP/out was symlinked to $TOP/out.angler: 1) Soong generates out.angler/soong/Android.mk 2) Kati's find generator produces in-memory tree of the filesystem 3) $(shell ) creates out.angler/Android.mk 4) The emulated findleaves Android.mk search finds out.angler/soong/Android.mk since the in-memory tree is never updated. This doesn't happen in the normal case, because we pass --prune=$OUT_DIR to findleaves. Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
2016-03-22 22:44:17 +01:00
$(KATI_BUILD_NINJA): $(CKATI) $(MAKEPARALLEL) $(DUMMY_OUT_MKS) run_soong FORCE
Set --ninja_suffix based on make/mm/mmm targets This fixes two issues: - Switching make target didn't work well when the latter make target is not a subset of the first make target. - Switching between m and mm/mmm forced build.ninja to be regenerated. Bug: 23685536 Change-Id: I3c3550d6cca3007d166a13367d6bc22cc3feede2
2015-09-01 07:24:18 +02:00
@echo Running kati to generate build$(KATI_NINJA_SUFFIX).ninja...
Fix kati --no_ignore_dirty usage Kati only supports a single use of --no_ignore_dirty, so we were ignoring the SOONG_ANDROID_MK file, and only detecting changes to SOONG_MAKEVARS_MK. Fix this by using a pattern that should apply to both of those makefiles. Change-Id: I46390f9887f95f1db0efe4e93339667f35ebc67c
2016-06-15 23:55:58 +02:00
+$(hide) $(KATI_MAKEPARALLEL) $(CKATI) --ninja --ninja_dir=$(OUT_DIR) --ninja_suffix=$(KATI_NINJA_SUFFIX) --regen --ignore_dirty=$(OUT_DIR)/% --no_ignore_dirty=$(SOONG_OUT_DIR)/%.mk --ignore_optional_include=$(OUT_DIR)/%.P --detect_android_echo $(KATI_FIND_EMULATOR) -f build/core/main.mk $(KATI_GOALS) --gen_all_targets BUILDING_WITH_NINJA=true SOONG_ANDROID_MK=$(SOONG_ANDROID_MK) SOONG_MAKEVARS_MK=$(SOONG_MAKEVARS_MK)
Use makeparallel to propagate -j flag to ninja or kati When USE_NINJA=true is set, use makeparallel to claim all jobs from make and pass them to ninja with -j. If USE_GOMA is set, pass the -j flag to kati instead so the parallelism can be set in the local_pool instead. Change-Id: I6e4f957c65683b74533ecb6d33e25de858922823
2015-09-06 09:35:21 +02:00
Build with kati+ninja when USE_NINJA=true If USE_NINJA=true, use kati to translate makefiles into ninja files, and then execute them with ninja. Builds kati from source using simplified versions of the rules in binary.mk and definitions.mk. Adds two new goals when USE_NINJA=true: generateonly will regenerate build.ninja but not rebuild (useful for comparing build.ninja output between runs), and fastincremental will skip regenerating build.ninja and go directly to running ninja, providing ~5 second incremental builds. Change-Id: Ib85399e730f1fbb1be7371fafeee7d1c31080771
2015-07-17 02:27:52 +02:00
.PHONY: FORCE
FORCE:
Reference in a new issue Copy permalink