diff options
| author | Dan Albert <danalbert@google.com> | 2016-01-12 14:50:36 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-01-13 17:34:06 -0800 |
| commit | 7528fef948b58069a5f81f1b1cb5b362af93f7ed (patch) | |
| tree | 0f1476adccd2501532809e1e14e52d639b1f8c73 /sources | |
| parent | a381d1185f3d81a5afb5008072fbd3ac4014927e (diff) | |
| download | ndk-7528fef948b58069a5f81f1b1cb5b362af93f7ed.tar.gz | |
Differentiate OUT_DIR and DIST_DIR.
DIST_DIR is archived on the build server, so we don't want to be
putting everything in there.
Also, this lays the groundwork for us to remove the build -> pack ->
unpack -> repack -> unpack -> test workflow that we currently have
and replace it with build -> test -> pack, since we can install
things to their proper locations, test them where they are, and then
package it directly.
Change-Id: I37529b5f564d82ba0e8b126d9fd44b4b148c1478
Diffstat (limited to 'sources')
| -rwxr-xr-x | sources/host-tools/make-3.81/build.py | 4 | ||||
| -rwxr-xr-x | sources/host-tools/nawk-20071023/build.py | 4 | ||||
| -rwxr-xr-x | sources/host-tools/ndk-depends/build.py | 4 | ||||
| -rwxr-xr-x | sources/host-tools/ndk-stack/build.py | 4 | ||||
| -rwxr-xr-x | sources/host-tools/toolbox/build.py | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sources/host-tools/make-3.81/build.py b/sources/host-tools/make-3.81/build.py index cbdc8e190..5f9d670ee 100755 --- a/sources/host-tools/make-3.81/build.py +++ b/sources/host-tools/make-3.81/build.py @@ -22,7 +22,7 @@ import site site.addsitedir(os.path.join(os.path.dirname(__file__), '../../../build/lib')) -import build_support +import build_support # pylint: disable=import-error def main(args): @@ -36,7 +36,7 @@ def main(args): if args.host != 'windows': build_cmd.append('--try-64') - build_support.build(build_cmd, args) + build_support.build(build_cmd, args, intermediate_package=True) if __name__ == '__main__': build_support.run(main) diff --git a/sources/host-tools/nawk-20071023/build.py b/sources/host-tools/nawk-20071023/build.py index aae38ed05..621e41106 100755 --- a/sources/host-tools/nawk-20071023/build.py +++ b/sources/host-tools/nawk-20071023/build.py @@ -22,7 +22,7 @@ import site site.addsitedir(os.path.join(os.path.dirname(__file__), '../../../build/lib')) -import build_support +import build_support # pylint: disable=import-error def main(args): @@ -36,7 +36,7 @@ def main(args): if args.host != 'windows': build_cmd.append('--try-64') - build_support.build(build_cmd, args) + build_support.build(build_cmd, args, intermediate_package=True) if __name__ == '__main__': build_support.run(main) diff --git a/sources/host-tools/ndk-depends/build.py b/sources/host-tools/ndk-depends/build.py index cd4d2b6d7..59c5a6fe0 100755 --- a/sources/host-tools/ndk-depends/build.py +++ b/sources/host-tools/ndk-depends/build.py @@ -22,7 +22,7 @@ import site site.addsitedir(os.path.join(os.path.dirname(__file__), '../../../build/lib')) -import build_support +import build_support # pylint: disable=import-error def main(args): @@ -38,7 +38,7 @@ def main(args): if args.host != 'windows': build_cmd.append('--try-64') - build_support.build(build_cmd, args) + build_support.build(build_cmd, args, intermediate_package=True) if __name__ == '__main__': build_support.run(main) diff --git a/sources/host-tools/ndk-stack/build.py b/sources/host-tools/ndk-stack/build.py index af667a208..a930ff437 100755 --- a/sources/host-tools/ndk-stack/build.py +++ b/sources/host-tools/ndk-stack/build.py @@ -22,7 +22,7 @@ import site site.addsitedir(os.path.join(os.path.dirname(__file__), '../../../build/lib')) -import build_support +import build_support # pylint: disable=import-error def main(args): @@ -38,7 +38,7 @@ def main(args): if args.host != 'windows': build_cmd.append('--try-64') - build_support.build(build_cmd, args) + build_support.build(build_cmd, args, intermediate_package=True) if __name__ == '__main__': build_support.run(main) diff --git a/sources/host-tools/toolbox/build.py b/sources/host-tools/toolbox/build.py index 618281433..58dd40afc 100755 --- a/sources/host-tools/toolbox/build.py +++ b/sources/host-tools/toolbox/build.py @@ -26,7 +26,7 @@ import sys site.addsitedir(os.path.join(os.path.dirname(__file__), '../../../build/lib')) -import build_support +import build_support # pylint: disable=import-error def main(args): @@ -40,7 +40,7 @@ def main(args): if args.host != 'windows': build_cmd.append('--try-64') - build_support.build(build_cmd, args) + build_support.build(build_cmd, args, intermediate_package=True) if __name__ == '__main__': build_support.run(main) |