04f53ed923
So that an external tool can read the configuration using dump-many-vars, and write out the soong.variables file while only loading config.mk. Also remove dumpvar-% from PARSE_TIME_MAKE_GOALS, since it's only used with CALLED_FROM_SETUP / config.mk. This provides an easy way to test this change as well. Test: get_build_var NINJA Test: get_build_var ANDROID_GOALS Test: get_build_var NINJA_GOALS Test: get_build_var KATI_GOALS Test: MAKECMDGOALS="droid sdk dumpvar-ANDROID_GOALS" get_build_var ANDROID_GOALS Test: MAKECMDGOALS="droid sdk dumpvar-NINJA_GOALS" get_build_var NINJA_GOALS Test: MAKECMDGOALS="droid sdk dumpvar-KATI_GOALS" get_build_var KATI_GOALS Test: MAKECMDGOALS="out/build-a.ninja dumpvar-ANDROID_GOALS" get_build_var ANDROID_GOALS Test: get_build_var SOONG_MAKEVARS_MK Test: get_build_var SOONG_VARIABLES Test: CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core make -f build/core/config.mk out/soong/soong.variables showcommands Test: Compare soong.variables from above, and before/after with `m` Test: Compare out before/after with `m doesnotexist` Test: `m dist doesnotexist` Change-Id: I1bc291aa165297c930fe600067edad6ce4979210
29 lines
1 KiB
Makefile
29 lines
1 KiB
Makefile
# We need to rebootstrap soong if SOONG_OUT_DIR or the reverse path from
|
|
# SOONG_OUT_DIR to TOP changes
|
|
SOONG_NEEDS_REBOOTSTRAP :=
|
|
ifneq ($(wildcard $(SOONG_BOOTSTRAP)),)
|
|
ifneq ($(SOONG_OUT_DIR),$(strip $(shell source $(SOONG_BOOTSTRAP); echo $$BUILDDIR)))
|
|
SOONG_NEEDS_REBOOTSTRAP := FORCE
|
|
$(warning soong_out_dir changed)
|
|
endif
|
|
ifneq ($(strip $(shell build/soong/scripts/reverse_path.py $(SOONG_OUT_DIR))),$(strip $(shell source $(SOONG_BOOTSTRAP); echo $$SRCDIR_FROM_BUILDDIR)))
|
|
SOONG_NEEDS_REBOOTSTRAP := FORCE
|
|
$(warning reverse path changed)
|
|
endif
|
|
endif
|
|
|
|
# Bootstrap soong.
|
|
$(SOONG_BOOTSTRAP): bootstrap.bash $(SOONG_NEEDS_REBOOTSTRAP)
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(hide) BUILDDIR=$(SOONG_OUT_DIR) ./bootstrap.bash
|
|
|
|
# Tell soong that it is embedded in make
|
|
$(SOONG_IN_MAKE):
|
|
$(hide) mkdir -p $(dir $@)
|
|
$(hide) touch $@
|
|
|
|
# Run Soong, this implicitly create an Android.mk listing all soong outputs as
|
|
# prebuilts.
|
|
.PHONY: run_soong
|
|
run_soong: $(SOONG_BOOTSTRAP) $(SOONG_VARIABLES) $(SOONG_IN_MAKE) FORCE
|
|
$(hide) SKIP_NINJA=true $(SOONG)
|