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

mainline_modules_sdks.py: Reformat am: 2ef33a4d65 am: 7a561d6ed1

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

Change-Id: Ibcb8e6da32de018eeeb3fd052eac48360ada1cbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Duffin
2022-03-30 18:05:31 +00:00
committed by Automerger Merge Worker
parent a59448a48c 7a561d6ed1
commit c44a9cd835
2 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
build/mainline_modules_sdks.py
View File

@@ -911,34 +911,31 @@ class SdkDistProducer:
for module in modules:
for sdk_version in sdk_versions:
for sdk in module.sdks:
sdk_dist_dir = os.path.join(
build_release_dist_dir, sdk_version)
self.populate_dist_snapshot(
build_release, module, sdk, sdk_dist_dir, sdk_version,
snapshots_dir)
sdk_dist_dir = os.path.join(build_release_dist_dir,
sdk_version)
self.populate_dist_snapshot(build_release, module, sdk,
sdk_dist_dir, sdk_version,
snapshots_dir)
def populate_bundled_dist(self, build_release, modules, snapshots_dir):
sdk_dist_dir = self.bundled_mainline_sdks_dir
for module in modules:
for sdk in module.sdks:
self.populate_dist_snapshot(
build_release, module, sdk, sdk_dist_dir, "current",
snapshots_dir)
self.populate_dist_snapshot(build_release, module, sdk,
sdk_dist_dir, "current",
snapshots_dir)
def populate_dist_snapshot(self, build_release, module, sdk, sdk_dist_dir,
sdk_version, snapshots_dir):
subdir = re.sub("^.+-(sdk|(host|test)-exports)$", r'\1', sdk)
subdir = re.sub("^.+-(sdk|(host|test)-exports)$", r"\1", sdk)
if subdir not in ("sdk", "host-exports", "test-exports"):
raise Exception(
f"{sdk} is not a valid name, expected it to end"
f" with -(sdk|host-exports|test-exports)"
)
raise Exception(f"{sdk} is not a valid name, expected it to end"
f" with -(sdk|host-exports|test-exports)")
sdk_dist_subdir = os.path.join(sdk_dist_dir, module.apex, subdir)
sdk_path = sdk_snapshot_zip_file(snapshots_dir, sdk, sdk_version)
transformations = module.transformations(build_release)
self.dist_sdk_snapshot_zip(sdk_path, sdk_dist_subdir,
transformations)
self.dist_sdk_snapshot_zip(sdk_path, sdk_dist_subdir, transformations)
def dist_sdk_snapshot_zip(self, src_sdk_zip, sdk_dist_dir, transformations):
"""Copy the sdk snapshot zip file to a dist directory.