Merge "Move shell and python scripts to scripts/ directory"
am: 7be391bff6
* commit '7be391bff64f4b7a1f1d8ba99911cf6a53e63d2f':
Move shell and python scripts to scripts/ directory
Change-Id: I129ae54b14e07662b8e145942ba7f6707dbf1afe
This commit is contained in:
@@ -8,7 +8,7 @@ if [[ "$ORIG_SRCDIR" != "." ]]; then
|
|||||||
echo "error: To use BUILDDIR, run from the source directory"
|
echo "error: To use BUILDDIR, run from the source directory"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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
|
cd $ORIG_SRCDIR
|
||||||
fi
|
fi
|
||||||
if [[ -z "$BUILDDIR" ]]; then
|
if [[ -z "$BUILDDIR" ]]; then
|
||||||
@@ -45,7 +45,7 @@ if [[ $# -eq 0 ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
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}|" \
|
sed -e "s|@@BuildDir@@|${BUILDDIR}|" \
|
||||||
-e "s|@@SrcDirFromBuildDir@@|${SRCDIR_FROM_BUILDDIR}|" \
|
-e "s|@@SrcDirFromBuildDir@@|${SRCDIR_FROM_BUILDDIR}|" \
|
||||||
|
@@ -101,7 +101,7 @@ var (
|
|||||||
},
|
},
|
||||||
"objcopyCmd", "prefix")
|
"objcopyCmd", "prefix")
|
||||||
|
|
||||||
copyGccLibPath = pctx.SourcePathVariable("copyGccLibPath", "build/soong/copygcclib.sh")
|
copyGccLibPath = pctx.SourcePathVariable("copyGccLibPath", "build/soong/scripts/copygcclib.sh")
|
||||||
|
|
||||||
copyGccLib = pctx.StaticRule("copyGccLib",
|
copyGccLib = pctx.StaticRule("copyGccLib",
|
||||||
blueprint.RuleParams{
|
blueprint.RuleParams{
|
||||||
|
2
reverse_path_test.py → scripts/reverse_path_test.py
Normal file → Executable file
2
reverse_path_test.py → scripts/reverse_path_test.py
Normal file → Executable file
@@ -1,3 +1,5 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
import os
|
import os
|
Reference in New Issue
Block a user