openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
platform_build/core/ninja.mk

104 lines
4.1 KiB
Makefile
Raw Normal View History

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 08:00:00 +08: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 08:27:52 +08: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-29 03:34:03 +08:00
# Modifier goals we don't need to pass to Ninja.
.PHONY : $(NINJA_EXCLUDE_GOALS)
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 10:41:33 +08: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 12:37:40 +08: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-29 03:34:03 +08: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 13:24:18 +08: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 10:41:33 +08: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 13:24:18 +08: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-23 05:37:53 +08: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 12:37:40 +08: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-10 06:21:12 +08: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-23 05:37:53 +08: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 08:27:52 +08: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-06-01 03:38:04 +08: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 08:27:52 +08: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 07:52:37 +08: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 08:57:45 +08: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 07:52:37 +08: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 08:27:52 +08: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-24 04:52:22 +08: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 07:52:37 +08: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-24 04:52:22 +08:00
Check USE_GOMA consistently Currently, the only way to properly disable goma is to unset USE_GOMA. If you set USE_GOMA=false, we won't turn on goma, but we'll pass -j500 to ninja. Test: USE_GOMA={x,false} m -j48 showcommands (inspect) Change-Id: I6b327d08ebadbe614a3bf7646fd597054bbfaaa2
2016-08-28 09:29:08 +08:00
ifneq ($(filter-out false,$(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 15:35:21 +08: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 15:22:44 +08: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 07:52:37 +08: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 15:35:21 +08: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-19 05:54:40 +08:00
NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja
Prevent Kati from seeing MAKEFLAGS We never want Kati to see MAKEFLAGS, as forcefully overriding variables is terrible. The variables in MAKEFLAGS are still available in the environment, so if part of the build wants input from the user, it should be explicitly checking for an environment variable or using ?= This commit shouldn't actually change any behavior -- the version of Kati checked into our tree doesn't actually read MAKEFLAGS (the latest version does, which is why this change is necessary). We're also already clearing MAKEFLAGS during makeparallel, so the USE_GOMA case already doesn't pass through MAKEFLAGS. Test: Manual $(warnings $(origin MYTEST) $(MYTEST)) with old and new Kati Change-Id: I5e4ffa66b3539a539cc7a26da24645b11445c469
2016-09-09 08:08:31 +08:00
# We never want Kati to see MAKEFLAGS, as forcefully overriding variables is
# terrible. The variables in MAKEFLAGS are still available in the environment,
# so if part of the build wants input from the user, it should be explicitly
# checking for an environment variable or using ?=
#
# makeparallel already clears MAKEFLAGS, so it's not necessary in the GOMA case
KATI_MAKEPARALLEL := MAKEFLAGS=
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 15:35:21 +08: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 07:52:37 +08: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-10 06:53:36 +08:00
COMBINED_BUILD_NINJA := $(OUT_DIR)/combined$(KATI_NINJA_SUFFIX).ninja
Update combined build.ninja to depend on Soong's build.ninja For Soong's build.ninja regeneration to work Bug: 32574042 Test: m -j, add globbed file, m -j Change-Id: Ie267ea33e8de88275e99330b2d0f147d1e58fa7b
2016-11-03 07:24:52 +08:00
$(COMBINED_BUILD_NINJA): $(KATI_BUILD_NINJA) FORCE
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-10 06:53:36 +08:00
$(hide) echo "builddir = $(OUT_DIR)" > $(COMBINED_BUILD_NINJA)
Enable goma in soong Pass the USE_GOMA flag to soong, and export the CC_WRAPPER environment variable after adding gomacc to it. Bug: 31142427 Change-Id: I6de698a40817c0615b03fa17bd27075465d79ffd
2016-09-01 00:35:32 +08:00
$(hide) echo "include $(KATI_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
$(hide) echo "include $(SOONG_BUILD_NINJA)" >> $(COMBINED_BUILD_NINJA)
Update combined build.ninja to depend on Soong's build.ninja For Soong's build.ninja regeneration to work Bug: 32574042 Test: m -j, add globbed file, m -j Change-Id: Ie267ea33e8de88275e99330b2d0f147d1e58fa7b
2016-11-03 07:24:52 +08:00
$(hide) echo "build $(COMBINED_BUILD_NINJA): phony $(SOONG_BUILD_NINJA)" >> $(COMBINED_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-10 06:53:36 +08: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-29 03:34:03 +08: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 08:27:52 +08: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-29 04:28:11 +08: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-10 06:53:36 +08: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 08:27:52 +08:00
@echo Starting build with ninja
exec makeparallel bash doesn't kill children when it receives SIGTERM. Since makeparallel is the last command run by the shell, run it with exec to replace the shell with makeparallel so make can send the signal directly to makeparallel. Bug: 31907490 Test: m -j & killall make; pgrep -a makeparallel Change-Id: If8aeb51ec224234da5f05eae3382ce77f48a57e2
2016-10-04 04:38:27 +08:00
+$(hide) export NINJA_STATUS="$(NINJA_STATUS)" && source $(KATI_ENV_SH) && exec $(NINJA_MAKEPARALLEL) $(NINJA) -d keepdepfile $(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 08:27:52 +08: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-23 05:44:17 +08: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 10:40:11 +08: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-23 05:44:17 +08: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 13:24:18 +08: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-16 05:55:58 +08: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 15:35:21 +08: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 08:27:52 +08:00
.PHONY: FORCE
FORCE: