Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1

* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits)
  Revert "install_symlink: Make symlink target configurable"
  Reapply "Clear as much of cc.Module as possible after GenerateBuildActions"
  Revert "rust: config: Fix missing CPU variant LD flags in Rust"
  Rename build-flag in outdir
  Revert^4 "cipd: Default CIPD proxy server to on, add opt-out"
  Convert check-vintf-all to phony with actions
  Create a partial implementation of check-vintf-all for soong-only
  Configure RBE rust pool based on build variant
  Revert^3 "Add sdk version check to arr"
  Add jdk.internal.invoke to the allowlist
  Make droid always depend on symbols zip
  Import Device and Odm skus
  Don't install gob_gen in Soong
  Remove bazel reference from run_integration_tests.sh
  Fix bootstrap_test.sh
  Don't panic in aconfig libraries when AllowMissingDependencies is set
  Avoid returning nil paths from PathForModuleSrc
  Revert "Flag controled clang version"
  Rework module target dependencies on required deps
  Revert^2 "Add sdk version check to arr"
  ...

Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de

1 files changed, 47 insertions, 43 deletions

diff --git a/python/scripts/main.py b/python/scripts/main.py
index 35cdfc47e..a3d8f65a2 100644
--- a/python/scripts/main.py
+++ b/python/scripts/main.py
@@ -1,48 +1,52 @@
+# It's important that we use a function here, as any global variables we make in this script will
+# also be available in the real entrypoint run by runpy._run_module_as_main.
+def _soong_main():
+  import os
+  import runpy
+  import shutil
+  import sys
+  import tempfile
+  import zipfile
 
-import os
-import runpy
-import shutil
-import sys
-import tempfile
-import zipfile
+  from pathlib import PurePath
 
-from pathlib import PurePath
+  sys.argv[0] = __loader__.archive
 
+  # Set sys.executable to None. The real executable is available as
+  # sys.argv[0], and too many things assume sys.executable is a regular Python
+  # binary, which isn't available. By setting it to None we get clear errors
+  # when people try to use it.
+  sys.executable = None
 
-sys.argv[0] = __loader__.archive
-
-# Set sys.executable to None. The real executable is available as
-# sys.argv[0], and too many things assume sys.executable is a regular Python
-# binary, which isn't available. By setting it to None we get clear errors
-# when people try to use it.
-sys.executable = None
-
-# Extract the shared libraries from the zip file into a temporary directory.
-# This works around the limitations of dynamic linker.  Some Python libraries
-# reference the .so files relatively and so extracting only the .so files
-# does not work, so we extract the entire parent directory of the .so files to a
-# tempdir and then add that to sys.path.
-tempdir = None
-with zipfile.ZipFile(__loader__.archive) as z:
-  # any root so files or root directories that contain so files will be
-  # extracted to the tempdir so the linker load them, this minimizes the
-  # number of files that need to be extracted to a tempdir
-  extract_paths = {}
-  for member in z.infolist():
-    if member.filename.endswith('.so'):
-      extract_paths[PurePath(member.filename).parts[0]] = member.filename
-  if extract_paths:
-    tempdir = tempfile.mkdtemp()
+  # Extract the shared libraries from the zip file into a temporary directory.
+  # This works around the limitations of dynamic linker.  Some Python libraries
+  # reference the .so files relatively and so extracting only the .so files
+  # does not work, so we extract the entire parent directory of the .so files to a
+  # tempdir and then add that to sys.path.
+  tempdir = None
+  with zipfile.ZipFile(__loader__.archive) as z:
+    # any root so files or root directories that contain so files will be
+    # extracted to the tempdir so the linker load them, this minimizes the
+    # number of files that need to be extracted to a tempdir
+    extract_paths = {}
     for member in z.infolist():
-      if not PurePath(member.filename).parts[0] in extract_paths.keys():
-        continue
-      if member.is_dir():
-        os.makedirs(os.path.join(tempdir, member.filename))
-      else:
-        z.extract(member, tempdir)
-    sys.path.insert(0, tempdir)
-try:
-  runpy._run_module_as_main("ENTRY_POINT", alter_argv=False)
-finally:
-  if tempdir is not None:
-    shutil.rmtree(tempdir)
+      if member.filename.endswith('.so'):
+        extract_paths[PurePath(member.filename).parts[0]] = member.filename
+    if extract_paths:
+      tempdir = tempfile.mkdtemp()
+      for member in z.infolist():
+        if not PurePath(member.filename).parts[0] in extract_paths.keys():
+          continue
+        if member.is_dir():
+          os.makedirs(os.path.join(tempdir, member.filename))
+        else:
+          z.extract(member, tempdir)
+      sys.path.insert(0, tempdir)
+  try:
+    runpy._run_module_as_main("ENTRY_POINT", alter_argv=False)
+  finally:
+    if tempdir is not None:
+      shutil.rmtree(tempdir)
+
+if __name__ == "__main__":
+  _soong_main()