Merge "Move shell and python scripts to scripts/ directory" am: 7be391bff6

am: 327e9395e2

* commit '327e9395e21f0d0a4d7118a42777e234f3a109f9':
  Move shell and python scripts to scripts/ directory

Change-Id: I812faaaa7e6a6a1c0089354acf67a780d8f7912c

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}|" \

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{

scripts/reverse_path_test.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from __future__ import print_function
 
 import os