diff options
| author | Colin Cross <ccross@android.com> | 2016-05-03 21:13:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-03 21:13:22 +0000 |
| commit | 7be391bff64f4b7a1f1d8ba99911cf6a53e63d2f (patch) | |
| tree | 47ad2b2d2da1b6339eed251783b8be7ebc0f1846 | |
| parent | 98943a0a630f77194e37bbd153d9c0ff194c2f76 (diff) | |
| parent | 1474741435774f15923967e50bf7531a3cc9d4f7 (diff) | |
| download | build_soong-7be391bff64f4b7a1f1d8ba99911cf6a53e63d2f.tar.gz build_soong-7be391bff64f4b7a1f1d8ba99911cf6a53e63d2f.tar.bz2 build_soong-7be391bff64f4b7a1f1d8ba99911cf6a53e63d2f.zip | |
Merge "Move shell and python scripts to scripts/ directory"
| -rwxr-xr-x | bootstrap.bash | 4 | ||||
| -rw-r--r-- | cc/builder.go | 2 | ||||
| -rwxr-xr-x | scripts/copygcclib.sh (renamed from copygcclib.sh) | 0 | ||||
| -rwxr-xr-x | scripts/reverse_path.py (renamed from reverse_path.py) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/reverse_path_test.py (renamed from reverse_path_test.py) | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/bootstrap.bash b/bootstrap.bash index 62c429c5..e48f4803 100755 --- a/bootstrap.bash +++ b/bootstrap.bash @@ -8,7 +8,7 @@ if [[ "$ORIG_SRCDIR" != "." ]]; then echo "error: To use BUILDDIR, run from the source directory" exit 1 fi - export BUILDDIR=$("${ORIG_SRCDIR}/build/soong/reverse_path.py" "$ORIG_SRCDIR") + export BUILDDIR=$("${ORIG_SRCDIR}/build/soong/scripts/reverse_path.py" "$ORIG_SRCDIR") cd $ORIG_SRCDIR fi if [[ -z "$BUILDDIR" ]]; then @@ -45,7 +45,7 @@ if [[ $# -eq 0 ]]; then exit 1 fi - export SRCDIR_FROM_BUILDDIR=$(build/soong/reverse_path.py "$BUILDDIR") + export SRCDIR_FROM_BUILDDIR=$(build/soong/scripts/reverse_path.py "$BUILDDIR") sed -e "s|@@BuildDir@@|${BUILDDIR}|" \ -e "s|@@SrcDirFromBuildDir@@|${SRCDIR_FROM_BUILDDIR}|" \ diff --git a/cc/builder.go b/cc/builder.go index f67f9bd3..ca8bc750 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -101,7 +101,7 @@ var ( }, "objcopyCmd", "prefix") - copyGccLibPath = pctx.SourcePathVariable("copyGccLibPath", "build/soong/copygcclib.sh") + copyGccLibPath = pctx.SourcePathVariable("copyGccLibPath", "build/soong/scripts/copygcclib.sh") copyGccLib = pctx.StaticRule("copyGccLib", blueprint.RuleParams{ diff --git a/copygcclib.sh b/scripts/copygcclib.sh index 93c52cc5..93c52cc5 100755 --- a/copygcclib.sh +++ b/scripts/copygcclib.sh diff --git a/reverse_path.py b/scripts/reverse_path.py index 7b7d6217..7b7d6217 100755 --- a/reverse_path.py +++ b/scripts/reverse_path.py diff --git a/reverse_path_test.py b/scripts/reverse_path_test.py index c5bb8e69..55776935 100644..100755 --- a/reverse_path_test.py +++ b/scripts/reverse_path_test.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + from __future__ import print_function import os |