Merge pull request #61284 from buttaface/droid

[android][test] Tweaks to get the new failing C++ Interop tests working

Author: compnerd

test/Interop/Cxx/class/memory-layout-silgen.swift

@@ -1,5 +1,8 @@
 // RUN: %target-swiftxx-frontend -I %S/Inputs -emit-ir -o - %s | %FileCheck %s
 
+// XFAIL: OS=linux-android
+// XFAIL: OS=linux-androideabi
+
 import MemoryLayout
 
 var v = PrivateMemberLayout()

test/lit.cfg

@@ -1681,6 +1681,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
         '-target', config.variant_triple,
         '-sdk', shell_quote(config.variant_sdk)])
     config.target_swift_ide_test = ' '.join([
+        'env', 'SDKROOT={}'.format(shell_quote(config.variant_sdk)),
         config.swift_ide_test,
         '-target', config.variant_triple,
         config.resource_dir_opt, mcp_opt, ccp_opt])
@@ -1702,7 +1703,7 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
         config.swiftc, '-emit-pcm',
         '-target', config.variant_triple])
     config.target_clang = ' '.join([
-        'clang++',
+        '{}/clang++'.format(tools_directory),
         '-target', config.variant_triple,
         clang_mcp_opt, '-isystem', config.variant_sdk, config.target_cc_options,
         '-fobjc-runtime=ios-5.0'])