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

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

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

23
build/mainline_modules_sdks.py
View File

@@ -897,34 +897,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,
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",
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.

15
build/mainline_modules_sdks_test.py
View File

@@ -25,9 +25,8 @@ from unittest import mock
import mainline_modules_sdks as mm
MAINLINE_MODULES_BY_APEX = dict((m.apex, m) for m in (
mm.MAINLINE_MODULES +
mm.BUNDLED_MAINLINE_MODULES +
MAINLINE_MODULES_BY_APEX = dict(
(m.apex, m) for m in (mm.MAINLINE_MODULES + mm.BUNDLED_MAINLINE_MODULES +
mm.PLATFORM_SDKS_FOR_MAINLINE))
@@ -159,8 +158,8 @@ class TestProduceDist(unittest.TestCase):
],
sorted(self.list_files_in_dir(self.tmp_dist_dir)))
r_snaphot_dir = os.path.join(
self.tmp_out_dir, "soong/mainline-sdks/test/for-R-build")
r_snaphot_dir = os.path.join(self.tmp_out_dir,
"soong/mainline-sdks/test/for-R-build")
aosp_ipsec_r_bp_file = "com.android.ipsec/Android.bp"
google_wifi_android_bp = "com.google.android.wifi/Android.bp"
self.assertEqual([
@@ -203,13 +202,11 @@ class TestProduceDist(unittest.TestCase):
self.produce_dist(modules, build_releases)
# pylint: disable=line-too-long
self.assertEqual(
[
self.assertEqual([
"mainline-sdks/for-S-build/current/com.android.art/host-exports/art-module-host-exports-current.zip",
"mainline-sdks/for-S-build/current/com.android.art/sdk/art-module-sdk-current.zip",
"mainline-sdks/for-S-build/current/com.android.art/test-exports/art-module-test-exports-current.zip",
],
sorted(self.list_files_in_dir(self.tmp_dist_dir)))
], sorted(self.list_files_in_dir(self.tmp_dist_dir)))
def test_latest_release(self):
modules = [