diff options
author | Dan Willemsen <dwillemsen@google.com> | 2017-08-04 16:04:04 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2017-08-18 10:13:22 -0700 |
commit | 99a75cd2a5102e72b07a7614e84f8624d3c2ddd1 (patch) | |
tree | 37cf7ebfe1dcbc192d496a72833dd4fc27a9e0d4 /bootstrap.bash | |
parent | fd697f425657d6f443def3f0b1862888b0095bac (diff) | |
download | build_soong-99a75cd2a5102e72b07a7614e84f8624d3c2ddd1.tar.gz build_soong-99a75cd2a5102e72b07a7614e84f8624d3c2ddd1.tar.bz2 build_soong-99a75cd2a5102e72b07a7614e84f8624d3c2ddd1.zip |
Obsolete bootstrap.bash and ./soong wrappers
We can call directly into the blueprint bootstrap.bash using values that
soong_ui has already calculated.
Instead of calling into blueprint.bash, build minibp with microfactory,
and directly run ninja. This allows us to get individual tracing data
from each component.
Test: m -j blueprint_tools
Test: m clean; m -j blueprint_tools
Change-Id: I2239943c9a8a3ad6e1a40fa0dc914421f4b5202c
Diffstat (limited to 'bootstrap.bash')
-rwxr-xr-x | bootstrap.bash | 64 |
1 files changed, 6 insertions, 58 deletions
diff --git a/bootstrap.bash b/bootstrap.bash index ff1ac8a6..769736ff 100755 --- a/bootstrap.bash +++ b/bootstrap.bash @@ -1,61 +1,9 @@ #!/bin/bash -set -e +echo '==== ERROR: bootstrap.bash & ./soong are obsolete ====' >&2 +echo 'Use `m --skip-make` with a standalone OUT_DIR instead.' >&2 +echo 'Without envsetup.sh, use:' >&2 +echo ' build/soong/soong_ui.bash --make-mode --skip-make' >&2 +echo '======================================================' >&2 +exit 1 -if [ -z "$NO_DEPRECATION_WARNING" ]; then - echo '== WARNING: bootstrap.bash & ./soong are deprecated ==' >&2 - echo 'Use `m --skip-make` with a standalone OUT_DIR instead.' >&2 - echo 'Without envsetup.sh, use:' >&2 - echo ' build/soong/soong_ui.bash --make-mode --skip-make' >&2 - echo '======================================================' >&2 -fi - -ORIG_SRCDIR=$(dirname "${BASH_SOURCE[0]}") -if [[ "$ORIG_SRCDIR" != "." ]]; then - if [[ ! -z "$BUILDDIR" ]]; then - echo "error: To use BUILDDIR, run from the source directory" - exit 1 - fi - export BUILDDIR=$("${ORIG_SRCDIR}/build/soong/scripts/reverse_path.py" "$ORIG_SRCDIR") - cd $ORIG_SRCDIR -fi -if [[ -z "$BUILDDIR" ]]; then - echo "error: Run ${BASH_SOURCE[0]} from the build output directory" - exit 1 -fi -export SRCDIR="." -export BOOTSTRAP="${SRCDIR}/bootstrap.bash" -export BLUEPRINTDIR="${SRCDIR}/build/blueprint" - -export TOPNAME="Android.bp" -export RUN_TESTS="-t" - -case $(uname) in - Linux) - export PREBUILTOS="linux-x86" - ;; - Darwin) - export PREBUILTOS="darwin-x86" - ;; - *) echo "unknown OS:" $(uname) && exit 1;; -esac -export GOROOT="${SRCDIR}/prebuilts/go/$PREBUILTOS" - -if [[ $# -eq 0 ]]; then - mkdir -p $BUILDDIR - - if [[ $(find $BUILDDIR -maxdepth 1 -name Android.bp) ]]; then - echo "FAILED: The build directory must not be a source directory" - exit 1 - fi - - export SRCDIR_FROM_BUILDDIR=$(build/soong/scripts/reverse_path.py "$BUILDDIR") - - sed -e "s|@@BuildDir@@|${BUILDDIR}|" \ - -e "s|@@SrcDirFromBuildDir@@|${SRCDIR_FROM_BUILDDIR}|" \ - -e "s|@@PrebuiltOS@@|${PREBUILTOS}|" \ - "$SRCDIR/build/soong/soong.bootstrap.in" > $BUILDDIR/.soong.bootstrap - ln -sf "${SRCDIR_FROM_BUILDDIR}/build/soong/soong.bash" $BUILDDIR/soong -fi - -"$SRCDIR/build/blueprint/bootstrap.bash" "$@" |