aboutsummaryrefslogtreecommitdiffstats
path: root/soong.bash
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-12-10 12:38:23 -0800
committerDan Willemsen <dwillemsen@google.com>2015-12-10 16:23:10 -0800
commit9301d8dfa1541887e1f35afde0b2cf4baa84ab25 (patch)
tree0ceaed0c2623a737721b229c969049383216d89d /soong.bash
parent34cc69e4bf36cb65bb181b42ccb0f8c792a32cfb (diff)
downloadbuild_soong-9301d8dfa1541887e1f35afde0b2cf4baa84ab25.tar.gz
build_soong-9301d8dfa1541887e1f35afde0b2cf4baa84ab25.tar.bz2
build_soong-9301d8dfa1541887e1f35afde0b2cf4baa84ab25.zip
Execute the blueprint wrapper
See https://github.com/google/blueprint/pull/86 for the blueprint change and description. Bug: 25448631 Change-Id: Ibadbfc8e2cf2592dcfd137156fc3681819078328
Diffstat (limited to 'soong.bash')
-rwxr-xr-xsoong.bash5
1 files changed, 2 insertions, 3 deletions
diff --git a/soong.bash b/soong.bash
index 782b0b76..d88ebbfc 100755
--- a/soong.bash
+++ b/soong.bash
@@ -20,9 +20,8 @@ source "${BOOTSTRAP}"
# $BOOTSTRAP are correct
cd ${SRCDIR_FROM_BUILDDIR}
-# Let Blueprint know that the Ninja we're using performs multiple passes that
-# can regenerate the build manifest.
-export BLUEPRINT_NINJA_HAS_MULTIPASS=1
+# Run the blueprint wrapper
+BUILDDIR="${BUILDDIR}" SKIP_NINJA=true build/blueprint/blueprint.bash
# Ninja can't depend on environment variables, so do a manual comparison
# of the relevant environment variables from the last build using the