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

mainline_modules_sdks.py: Reformat

Browse Source 
Test: atest --host mainline_modules_sdks_test
      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: I7f7b5f6e41c6a8cec02ec547a9b61c7922700880
This commit is contained in:
Paul Duffin
2022-03-29 13:42:09 +00:00
parent 8fa5ddae14
commit 2ef33a4d65
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

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

41
build/mainline_modules_sdks_test.py
View File

@@ -25,10 +25,9 @@ from unittest import mock
import mainline_modules_sdks as mm import mainline_modules_sdks as mm
MAINLINE_MODULES_BY_APEX = dict((m.apex, m) for m in ( MAINLINE_MODULES_BY_APEX = dict(
mm.MAINLINE_MODULES + (m.apex, m) for m in (mm.MAINLINE_MODULES + mm.BUNDLED_MAINLINE_MODULES +
mm.BUNDLED_MAINLINE_MODULES + mm.PLATFORM_SDKS_FOR_MAINLINE))
mm.PLATFORM_SDKS_FOR_MAINLINE))
class FakeSnapshotBuilder(mm.SnapshotBuilder): class FakeSnapshotBuilder(mm.SnapshotBuilder):
@@ -159,8 +158,8 @@ class TestProduceDist(unittest.TestCase):
], ],
sorted(self.list_files_in_dir(self.tmp_dist_dir))) sorted(self.list_files_in_dir(self.tmp_dist_dir)))
r_snaphot_dir = os.path.join( r_snaphot_dir = os.path.join(self.tmp_out_dir,
self.tmp_out_dir, "soong/mainline-sdks/test/for-R-build") "soong/mainline-sdks/test/for-R-build")
aosp_ipsec_r_bp_file = "com.android.ipsec/Android.bp" aosp_ipsec_r_bp_file = "com.android.ipsec/Android.bp"
google_wifi_android_bp = "com.google.android.wifi/Android.bp" google_wifi_android_bp = "com.google.android.wifi/Android.bp"
self.assertEqual([ self.assertEqual([
@@ -195,27 +194,25 @@ class TestProduceDist(unittest.TestCase):
def test_old_release(self): def test_old_release(self):
modules = [ modules = [
MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module
MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module
MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK
] ]
build_releases = [mm.S] build_releases = [mm.S]
self.produce_dist(modules, build_releases) self.produce_dist(modules, build_releases)
# pylint: disable=line-too-long # 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/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/sdk/art-module-sdk-current.zip", "mainline-sdks/for-S-build/current/com.android.art/test-exports/art-module-test-exports-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): def test_latest_release(self):
modules = [ modules = [
MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module
MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module
MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK
] ]
build_releases = [mm.LATEST] build_releases = [mm.LATEST]
self.produce_dist(modules, build_releases) self.produce_dist(modules, build_releases)
@@ -237,9 +234,9 @@ class TestProduceDist(unittest.TestCase):
def test_legacy_release(self): def test_legacy_release(self):
modules = [ modules = [
MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module
MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module
MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK
] ]
build_releases = [mm.LEGACY_BUILD_RELEASE] build_releases = [mm.LEGACY_BUILD_RELEASE]
self.produce_dist(modules, build_releases) self.produce_dist(modules, build_releases)