diff options
| author | Luca Farsi <lucafarsi@google.com> | 2024-03-27 22:14:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-27 22:14:40 +0000 |
| commit | f8e7919759b5d43cc6c6edd09397b140e16fdb2d (patch) | |
| tree | 64be91bd0bc9b51f497194549445993f048b27d9 | |
| parent | 6c539c0d83c9064f8ec22582c1fff99e0f084677 (diff) | |
| parent | c2ba38a7c1ab96bf4da5a75edf50fee5b2167791 (diff) | |
| download | build-f8e7919759b5d43cc6c6edd09397b140e16fdb2d.tar.gz | |
Merge "switch to using DIST_DIR env var for dist" into main
| -rw-r--r-- | ci/build_test_suites.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ci/build_test_suites.py b/ci/build_test_suites.py index 23e896d70a..1d5b3774d9 100644 --- a/ci/build_test_suites.py +++ b/ci/build_test_suites.py @@ -57,7 +57,6 @@ def parse_args(argv): argparser.add_argument( '--with_dexpreopt_boot_img_and_system_server_only', action='store_true' ) - argparser.add_argument('--dist_dir') argparser.add_argument('--change_info', nargs='?') return argparser.parse_args() @@ -92,16 +91,17 @@ def build_affected_modules(args: argparse.Namespace): run_command(build_command, print_output=True) - zip_build_outputs(modules_to_build, args.dist_dir, args.target_release) + zip_build_outputs(modules_to_build, args.target_release) -def base_build_command(args: argparse.Namespace, extra_targets: set[str]) -> list: +def base_build_command( + args: argparse.Namespace, extra_targets: set[str] +) -> list: build_command = [] build_command.append('time') build_command.append('./build/soong/soong_ui.bash') build_command.append('--make-mode') build_command.append('dist') - build_command.append('DIST_DIR=' + args.dist_dir) build_command.append('TARGET_PRODUCT=' + args.target_product) build_command.append('TARGET_RELEASE=' + args.target_release) if args.with_dexpreopt_boot_img_and_system_server_only: @@ -220,7 +220,7 @@ def matches_file_patterns( def zip_build_outputs( - modules_to_build: set[str], dist_dir: str, target_release: str + modules_to_build: set[str], target_release: str ): src_top = os.environ.get('TOP', os.getcwd()) @@ -236,6 +236,7 @@ def zip_build_outputs( product_out = pathlib.Path(get_soong_var('PRODUCT_OUT', target_release)) soong_host_out = pathlib.Path(get_soong_var('SOONG_HOST_OUT', target_release)) host_out = pathlib.Path(get_soong_var('HOST_OUT', target_release)) + dist_dir = pathlib.Path(get_soong_var('DIST_DIR', target_release)) # Call the class to package the outputs. # TODO(lucafarsi): Move this code into a replaceable class. |