diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-08-13 16:47:45 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-08-31 01:20:29 -0700 |
| commit | 79d2f256d4f2d6fe290e19174cf448662261e1d1 (patch) | |
| tree | e05699a8fdcc885c6b3ab04d7df362876cdf98c7 /soong.bash | |
| parent | 27807b5415d4687d139651284c39d3bfbc221f7b (diff) | |
| download | build_soong-79d2f256d4f2d6fe290e19174cf448662261e1d1.tar.gz build_soong-79d2f256d4f2d6fe290e19174cf448662261e1d1.tar.bz2 build_soong-79d2f256d4f2d6fe290e19174cf448662261e1d1.zip | |
Simplify bootstrapping
Follow changes from https://github.com/google/blueprint/pull/121
Change-Id: Icc5003f6e8592a667e1ce5e58361c03997078763
Diffstat (limited to 'soong.bash')
| -rwxr-xr-x | soong.bash | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -20,9 +20,6 @@ source "${BOOTSTRAP}" # $BOOTSTRAP are correct cd ${SRCDIR_FROM_BUILDDIR} -# 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 # soong_env tool and trigger a build manifest regeneration if necessary @@ -40,4 +37,4 @@ if [ -f "${ENVFILE}" ]; then fi fi -"prebuilts/build-tools/${PREBUILTOS}/bin/ninja" -f "${BUILDDIR}/build.ninja" -w dupbuild=err "$@" +BUILDDIR="${BUILDDIR}" NINJA="prebuilts/build-tools/${PREBUILTOS}/bin/ninja" build/blueprint/blueprint.bash "$@" |