aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Jansen <jansene@google.com>2024-05-01 11:59:55 -0700
committerErwin Jansen <jansene@google.com>2024-05-01 12:55:20 -0700
commit6d83390038b8223c079c4a6476a78d40db28cd99 (patch)
tree9a09e2807cafc4b81035a7240732ca6d9e0f80d6
parentb8ce864971bada8d45aef96a6a40a6c77cabdfad (diff)
downloadbuildSrc-emu-dev.tar.gz
Only binplace zip files with current build-idemu-dev
Bazel can cache older release.zips, which we could accidentally pick up and binplace. Change-Id: Iebd8a2c39758835694ec3121c2c89f1258041cbe
-rwxr-xr-xservers/build.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/build.py b/servers/build.py
index 661ce80..2c4df0d 100755
--- a/servers/build.py
+++ b/servers/build.py
@@ -26,11 +26,11 @@ from build_environment import BuildEnvironment
from log_handler import config_logging
from utils import AOSP_ROOT, BAZEL, run
-def copy_zip_files(src_dir: Path, dst_dir: Path):
+def copy_zip_files(src_dir: Path, dst_dir: Path, match: str):
"""Copies all ZIP files from the source directory and its subdirectories to the destination directory."""
# Find all ZIP files in the source directory and its subdirectories
- zip_files = src_dir.rglob("*.zip")
+ zip_files = src_dir.rglob(match)
for zip_file in zip_files:
shutil.copy2(zip_file, dst_dir) # Use shutil for the actual copy
@@ -78,7 +78,7 @@ def build_aemu(args):
# Finally binplace the generated zip.
res = AOSP_ROOT / "bazel-bin" / "hardware" / "generic" / "goldfish" / "emulator"
- copy_zip_files(res, Path(args.dist))
+ copy_zip_files(res, Path(args.dist), f"*{args.build_id}*.zip")
def main():