LineageOS/android_packages_modules_common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract unzip_current_stubs from SdkDistProducer

Browse Source 
A minor refactoring that generalizes the method, making it usable for
other cases and decouples it from SdkDistProducer and SnapshotBuilder.

Bug: 218685706
Test: atest --host mainline_modules_sdks_test
      packages/modules/common/build/mainline_modules_sdks.sh
      pyformat -s 4 --force_quote_type double -i build/mainline_modules_sdks*.py
      /usr/bin/pylint --rcfile $ANDROID_BUILD_TOP/tools/repohooks/tools/pylintrc build/mainline_modules_sdks*.py
Change-Id: I885b7d0e792691f7028cdfb91e72896be48333a1
This commit is contained in:
Paul Duffin
2022-03-17 18:23:55 +00:00
parent 14c6bd8c38
commit dc0c4c5d3f
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
build/mainline_modules_sdks.py
View File

@@ -584,16 +584,6 @@ class SdkDistProducer:
modules) modules)
self.populate_dist(build_release, sdk_versions, modules) self.populate_dist(build_release, sdk_versions, modules)
def unzip_current_stubs(self, sdk_name, apex_name):
"""Unzips stubs for "current" into {producer.dist_dir}/stubs/{apex}."""
sdk_path = self.snapshot_builder.get_sdk_path(sdk_name, "current")
dest_dir = os.path.join(self.dist_dir, "stubs", apex_name)
print(
f"Extracting java_sdk_library files from {sdk_path} to {dest_dir}")
os.makedirs(dest_dir, exist_ok=True)
extract_matching_files_from_zip(
sdk_path, dest_dir, r"sdk_library/[^/]+/[^/]+\.(txt|jar|srcjar)")
def populate_stubs(self, modules): def populate_stubs(self, modules):
# TODO(b/199759953): Remove stubs once it is no longer used by gantry. # TODO(b/199759953): Remove stubs once it is no longer used by gantry.
# Clear and populate the stubs directory. # Clear and populate the stubs directory.
@@ -602,11 +592,15 @@ class SdkDistProducer:
for module in modules: for module in modules:
apex = module.apex apex = module.apex
dest_dir = os.path.join(self.dist_dir, "stubs", apex)
for sdk in module.sdks: for sdk in module.sdks:
# If the sdk's name ends with -sdk then extract sdk library # If the sdk's name ends with -sdk then extract sdk library
# related files from its zip file. # related files from its zip file.
if sdk.endswith("-sdk"): if sdk.endswith("-sdk"):
self.unzip_current_stubs(sdk, apex) sdk_file = self.snapshot_builder.get_sdk_path(
sdk, "current")
extract_matching_files_from_zip(sdk_file, dest_dir,
sdk_library_files_pattern())
def populate_dist(self, build_release, sdk_versions, modules): def populate_dist(self, build_release, sdk_versions, modules):
build_release_dist_dir = os.path.join(self.mainline_sdks_dir, build_release_dist_dir = os.path.join(self.mainline_sdks_dir,
@@ -675,15 +669,22 @@ def print_command(env, cmd):
print(" ".join([f"{name}={value}" for name, value in env.items()] + cmd)) print(" ".join([f"{name}={value}" for name, value in env.items()] + cmd))
def sdk_library_files_pattern(*, scope_pattern=r"[^/]+", name_pattern=r"[^/]+"):
"""Return a pattern to match sdk_library related files in an sdk snapshot"""
return rf"sdk_library/{scope_pattern}/{name_pattern}\.(txt|jar|srcjar)"
def extract_matching_files_from_zip(zip_path, dest_dir, pattern): def extract_matching_files_from_zip(zip_path, dest_dir, pattern):
"""Extracts files from a zip file into a destination directory. """Extracts files from a zip file into a destination directory.
The extracted files are those that match the specified regular expression The extracted files are those that match the specified regular expression
pattern. pattern.
""" """
os.makedirs(dest_dir, exist_ok=True)
with zipfile.ZipFile(zip_path) as zip_file: with zipfile.ZipFile(zip_path) as zip_file:
for filename in zip_file.namelist(): for filename in zip_file.namelist():
if re.match(pattern, filename): if re.match(pattern, filename):
print(f" extracting {filename}")
zip_file.extract(filename, dest_dir) zip_file.extract(filename, dest_dir)