Merge "Update llvm-toolchain to r445002"

android_version.py

@@ -19,8 +19,8 @@
 _llvm_next = False
 _version_read = False
 
-_patch_level = '1'
-_svn_revision = 'r437112b'
+_patch_level = '2'
+_svn_revision = 'r445002'
 # svn_revision_next will be newer than the official svn_revision in the future.
 _svn_revision_next = 'r445002'
 

builders.py

@@ -504,12 +504,7 @@ def cmake_defines(self) -> Dict[str, str]:
     def install_config(self) -> None:
         # We need to install libunwind manually.
         arch = self._config.target_arch
-        if android_version.get_svn_revision() == 'r445002':
-            if not android_version.is_llvm_next():
-                raise RuntimeError('remove this version check')
-            src_path = self.output_dir / 'lib' / 'libunwind.a'
-        else:
-            src_path = self.output_dir / 'lib64' / 'libunwind.a'
+        src_path = self.output_dir / 'lib' / 'libunwind.a'
         out_res_dir = self.output_toolchain.resource_dir / arch.value
         out_res_dir.mkdir(parents=True, exist_ok=True)
 
@@ -890,12 +885,7 @@ def install_config(self) -> None:
         install_dir = self._config.sysroot / 'usr' / lib_name
 
         if self._is_64bit():
-            if android_version.get_svn_revision() == 'r445002':
-                if not android_version.is_llvm_next():
-                    raise RuntimeError('remove this version check')
-                src_path = self.output_dir / 'lib' / 'libc++abi.a'
-            else:
-                src_path = self.output_dir / 'lib64' / 'libc++abi.a'
+            src_path = self.output_dir / 'lib' / 'libc++abi.a'
             shutil.copy2(src_path, install_dir / 'libc++abi.a')
         else:
             with (install_dir / 'libc++abi.so').open('w') as f:

do_test_compiler.py

@@ -281,11 +281,16 @@ def build_target(android_base: Path, clang_version: version.Version,
 
     modulesList = ' '.join(modules)
     print('Start building target %s and modules %s.' % (target, modulesList))
-    subprocess.check_call(
-        ['/bin/bash', '-c', 'build/soong/soong_ui.bash --make-mode ' + jobs + \
-         ' ' + modulesList],
-        cwd=android_base,
-        env=env)
+    # TODO(pirama) http://b/217427398 Temporarily allow failures during build
+    # until we can support compiler fallback in RBE.
+    try:
+        subprocess.check_call(
+            ['/bin/bash', '-c', 'build/soong/soong_ui.bash --make-mode ' + jobs + \
+             ' ' + modulesList + ' -k'],
+            cwd=android_base,
+            env=env)
+    except subprocess.CalledProcessError as err:
+        print(f'target build failed: {err}')
 
 
 def test_device(android_base: Path, clang_version: version.Version, device: List[str],