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

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>

2 files changed, 31 insertions, 37 deletions

diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index dc04877b..e906ab53 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -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.
diff --git a/build/mainline_modules_sdks_test.py b/build/mainline_modules_sdks_test.py
index 084230e8..84c775d3 100644
--- a/build/mainline_modules_sdks_test.py
+++ b/build/mainline_modules_sdks_test.py
@@ -25,10 +25,9 @@ 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 +
-    mm.PLATFORM_SDKS_FOR_MAINLINE))
+MAINLINE_MODULES_BY_APEX = dict(
+    (m.apex, m) for m in (mm.MAINLINE_MODULES + mm.BUNDLED_MAINLINE_MODULES +
+                          mm.PLATFORM_SDKS_FOR_MAINLINE))
 
 
 class FakeSnapshotBuilder(mm.SnapshotBuilder):
@@ -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([
@@ -195,27 +194,25 @@ class TestProduceDist(unittest.TestCase):
 
     def test_old_release(self):
         modules = [
-            MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module
-            MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module
-            MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK
+            MAINLINE_MODULES_BY_APEX["com.android.art"],  # An unnbundled module
+            MAINLINE_MODULES_BY_APEX["com.android.runtime"],  # A bundled module
+            MAINLINE_MODULES_BY_APEX["platform-mainline"],  # Platform SDK
         ]
         build_releases = [mm.S]
         self.produce_dist(modules, build_releases)
 
         # pylint: disable=line-too-long
-        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)))
+        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)))
 
     def test_latest_release(self):
         modules = [
-            MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module
-            MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module
-            MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK
+            MAINLINE_MODULES_BY_APEX["com.android.art"],  # An unnbundled module
+            MAINLINE_MODULES_BY_APEX["com.android.runtime"],  # A bundled module
+            MAINLINE_MODULES_BY_APEX["platform-mainline"],  # Platform SDK
         ]
         build_releases = [mm.LATEST]
         self.produce_dist(modules, build_releases)
@@ -237,9 +234,9 @@ class TestProduceDist(unittest.TestCase):
 
     def test_legacy_release(self):
         modules = [
-            MAINLINE_MODULES_BY_APEX["com.android.art"], # An unnbundled module
-            MAINLINE_MODULES_BY_APEX["com.android.runtime"], # A bundled module
-            MAINLINE_MODULES_BY_APEX["platform-mainline"], # Platform SDK
+            MAINLINE_MODULES_BY_APEX["com.android.art"],  # An unnbundled module
+            MAINLINE_MODULES_BY_APEX["com.android.runtime"],  # A bundled module
+            MAINLINE_MODULES_BY_APEX["platform-mainline"],  # Platform SDK
         ]
         build_releases = [mm.LEGACY_BUILD_RELEASE]
         self.produce_dist(modules, build_releases)