Execute the blueprint wrapper
See https://github.com/google/blueprint/pull/86 for the blueprint change
and description.
Bug: 25448631
Change-Id: Ibadbfc8e2cf2592dcfd137156fc3681819078328
diff --git a/soong.bash b/soong.bash
index 782b0b7..d88ebbf 100755
--- a/soong.bash
+++ b/soong.bash
@@ -20,9 +20,8 @@
# $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