Extract common packaging code

… so each platform has only a function to lay out files.

Issue: 365150653
Reviewed-on: #4797

Author: dahlstrom-g

cobalt/build/android/package.py

@@ -1,33 +1,17 @@
 #!/usr/bin/env python3
 """Packages Cobalt for Android."""
 
-import argparse
 import os
 import shutil
-import tempfile
+from cobalt.build import packaging
 
 
-def main():
-  parser = argparse.ArgumentParser()
-  parser.add_argument('--name', required=True, help='of archive and base dir')
-  parser.add_argument('out_dir', help='generated by GN and built by Ninja')
-  parser.add_argument('package_dir', help='where to place the archive')
-  args = parser.parse_args()
-  package(args.out_dir, args.package_dir, args.name)
-
-
-def package(out_dir, package_dir, name):
-  with tempfile.TemporaryDirectory() as tmp_dir:
-    base_dir = os.path.join(tmp_dir, name)
-    os.makedirs(base_dir)
-
-    shutil.copy2(os.path.join(out_dir, 'apks/Cobalt.apk'), base_dir)
-    shutil.copytree(
-        os.path.join(out_dir, 'content'),
-        os.path.join(base_dir, 'cobalt_package', 'content'))
-
-    shutil.make_archive(os.path.join(package_dir, name), 'zip', tmp_dir)
+def lay_out(out_dir, base_dir):
+  shutil.copy2(os.path.join(out_dir, 'apks/Cobalt.apk'), base_dir)
+  shutil.copytree(
+      os.path.join(out_dir, 'content'),
+      os.path.join(base_dir, 'cobalt_package', 'content'))
 
 
 if __name__ == '__main__':
-  main()
+  packaging.run(lay_out)

cobalt/build/linux/package.py

@@ -1,40 +1,24 @@
 #!/usr/bin/env python3
 """Packages Cobalt for Linux."""
 
-import argparse
 import os
 import shutil
-import tempfile
+from cobalt.build import packaging
 
 
-def main():
-  parser = argparse.ArgumentParser()
-  parser.add_argument('--name', required=True, help='of archive and base dir')
-  parser.add_argument('out_dir', help='generated by GN and built by Ninja')
-  parser.add_argument('package_dir', help='where to place the archive')
-  args = parser.parse_args()
-  package(args.out_dir, args.package_dir, args.name)
-
-
-def package(out_dir, package_dir, name):
-  with tempfile.TemporaryDirectory() as tmp_dir:
-    base_dir = os.path.join(tmp_dir, name)
-    os.makedirs(base_dir)
-
-    place_in_base_dir = [
-        'cobalt',
-        'content_shell.pak',
-        'icudtl.dat',
-        'libEGL.so',
-        'libGLESv2.so',
-        'starboard/libstarboard.so.17',
-        'v8_context_snapshot.bin',
-    ]
-    for f in place_in_base_dir:
-      shutil.copy2(os.path.join(out_dir, f), base_dir)
-
-    shutil.make_archive(os.path.join(package_dir, name), 'zip', tmp_dir)
+def lay_out(out_dir, base_dir):
+  place_in_base_dir = [
+      'cobalt',
+      'content_shell.pak',
+      'icudtl.dat',
+      'libEGL.so',
+      'libGLESv2.so',
+      'starboard/libstarboard.so.17',
+      'v8_context_snapshot.bin',
+  ]
+  for f in place_in_base_dir:
+    shutil.copy2(os.path.join(out_dir, f), base_dir)
 
 
 if __name__ == '__main__':
-  main()
+  packaging.run(lay_out)

cobalt/build/packaging.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+"""Packages Cobalt with a given layout."""
+
+import argparse
+import os
+import shutil
+import tempfile
+
+
+def run(lay_out):
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--name', required=True, help='of archive and base dir')
+  parser.add_argument('out_dir', help='generated by GN and built by Ninja')
+  parser.add_argument('package_dir', help='where to place the archive')
+  args = parser.parse_args()
+
+  with tempfile.TemporaryDirectory() as tmp_dir:
+    base_dir = os.path.join(tmp_dir, args.name)
+    os.makedirs(base_dir)
+    lay_out(args.out_dir, base_dir)
+    shutil.make_archive(
+        os.path.join(args.package_dir, args.name), 'zip', tmp_dir)

cobalt/devinfra/kokoro/bin/common.sh

@@ -289,6 +289,7 @@ run_package_release_pipeline () {
     cp "${build_info_path}" "${package_dir}/"
 
     # Create release package.
+    export PYTHONPATH="${WORKSPACE_COBALT}"
     if [[ "${PLATFORM}" =~ "android" ]]; then
       python3 "${WORKSPACE_COBALT}/cobalt/build/android/package.py" \
         --name=cobalt-android "${out_dir}" "${package_dir}"