Merge "Copy the out/soong/build_number.txt file into sdk snapshots for R" am: b1e623fd6d am: 1332595b84

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2056031

Change-Id: I612df016b6c9e03ee6aa49a34ed52f3d99ab35c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2022-04-07 17:23:54 +00:00
committed by Automerger Merge Worker
2 changed files with 27 additions and 0 deletions

View File

@@ -303,6 +303,8 @@ class SnapshotBuilder:
r_snapshot_dir = os.path.join(snapshot_dir, "for-R-build")
shutil.rmtree(r_snapshot_dir, ignore_errors=True)
build_number_file = os.path.join(self.out_dir, "soong/build_number.txt")
for module in modules:
apex = module.apex
dest_dir = os.path.join(r_snapshot_dir, apex)
@@ -323,6 +325,7 @@ class SnapshotBuilder:
bp.write(f"// {self.tool_path}\n")
bp.write(COPYRIGHT_BOILERPLATE)
aosp_apex = google_to_aosp_name(apex)
for library in module.for_r_build.sdk_libraries:
module_name = library.name
shared_library = str(library.shared_library).lower()
@@ -365,6 +368,12 @@ java_sdk_library_import {{
}}
""")
# Copy the build_number.txt file into the snapshot.
snapshot_build_number_file = os.path.join(
dest_dir, "snapshot-creation-build-number.txt")
shutil.copy(build_number_file, snapshot_build_number_file)
# Now zip up the files into a snapshot zip file.
base_file = os.path.join(r_snapshot_dir, sdk_name + "-current")
shutil.make_archive(base_file, "zip", dest_dir)