From 0dbcdd5c2812570b96876718f9f8e5f2b4c97177 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 3 Sep 2018 17:30:31 -0400 Subject: [sdks] Add cross-{arm,arm64,x86,x86_64}{,-win} runtimes for XA + Unify provisioning of LLVM for both Android and iOS. (#10445) * [sdks] Add CrossRuntimeTemplate * [sdks] Add cross-{arm,arm64,x86,x86_64}{,-win} runtimes for XA * [sdks] Use CrossRuntimeTemplate for iOS * [sdks] Factor various variables for RuntimeTemplate * [sdks] Use MonoRuntime template for desktop-x86_64 * [sdks] Unify provisioning of LLVM for both Android and iOS. A global CFLAGS would be set in `run-jenkins.sh`, and that would screw up with LLVM. The global CFLAGS makes sense as long as we are only building Mono, but that's not the case with LLVM anymore. * [sdks] Remove android-armeabi, it's been removed from XA already and the target has been deprecated in the NDK --- sdks/builds/.gitignore | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'sdks/builds/.gitignore') diff --git a/sdks/builds/.gitignore b/sdks/builds/.gitignore index 1540d3909e7..85dd77912d6 100644 --- a/sdks/builds/.gitignore +++ b/sdks/builds/.gitignore @@ -1,4 +1,3 @@ -# build artifacts .stamp-* *.mk.generated *.config.cache @@ -7,6 +6,7 @@ llvm-llvm32/ llvm-llvm64/ llvm-llvmwin32/ llvm-llvmwin64/ +llvm36-llvm32/ android-armeabi-*/ android-armeabi-v7a-*/ android-arm64-v8a-*/ @@ -16,6 +16,14 @@ android-host-Darwin-*/ android-host-Linux-*/ android-host-mxe-Win32-*/ android-host-mxe-Win64-*/ +android-cross-arm-*/ +android-cross-arm64-*/ +android-cross-x86-*/ +android-cross-x86_64-*/ +android-cross-arm-win-*/ +android-cross-arm64-win-*/ +android-cross-x86-win-*/ +android-cross-x86_64-win-*/ ios-target32-*/ ios-target32s-*/ ios-target64-*/ @@ -32,6 +40,4 @@ wasm-interp/ bcl/ desktop-x86/ desktop-x86_64/ - -# android toolchain toolchains/ -- cgit v1.2.3