Skip to content

Commit a9927d8

Browse files
LucianoPAlmeidaLucianoPAlmeida
committed
---
yaml --- r: 315259 b: refs/heads/master-next c: d55e1f6 h: refs/heads/master i: 315257: cffadb0 315255: d27437f
1 parent 744715e commit a9927d8

File tree

511 files changed

+10164
-13474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+10164
-13474
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 3fe9333052029c114ef816ea805c335eb1ee8a99
3-
refs/heads/master-next: 37abc520ef6733bdfd5b5e1384c0223d5a7f4829
3+
refs/heads/master-next: d55e1f6055ce0a782b8a32567cf2dca5f1b3c9f6
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

‎branches/master-next/CMakeLists.txt

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL MSVC)
450450
endif()
451451

452452
if(CMAKE_SYSTEM_NAME STREQUAL Darwin OR
453-
EXISTS "${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}")
453+
EXISTS ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})
454454
set(SWIFT_BUILD_SYNTAXPARSERLIB_default TRUE)
455455
set(SWIFT_BUILD_SOURCEKIT_default TRUE)
456456
else()
@@ -603,13 +603,7 @@ if(SWIFT_HOST_VARIANT_SDK)
603603
set(SWIFT_HOST_VARIANT_SDK_default "${SWIFT_HOST_VARIANT_SDK}")
604604
else()
605605
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
606-
# CMake on an Android host sets this to Linux, so check for the ANDROID_DATA
607-
# environment variable to see if we're building on Android.
608-
if(NOT "$ENV{ANDROID_DATA}" STREQUAL "")
609-
set(SWIFT_HOST_VARIANT_SDK_default "ANDROID")
610-
else()
611-
set(SWIFT_HOST_VARIANT_SDK_default "LINUX")
612-
endif()
606+
set(SWIFT_HOST_VARIANT_SDK_default "LINUX")
613607
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
614608
set(SWIFT_HOST_VARIANT_SDK_default "FREEBSD")
615609
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
@@ -619,7 +613,6 @@ else()
619613
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Haiku")
620614
set(SWIFT_HOST_VARIANT_SDK_default "HAIKU")
621615
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
622-
# CMAKE_SYSTEM_NAME might be set this way when cross-compiling to Android.
623616
set(SWIFT_HOST_VARIANT_SDK_default "ANDROID")
624617
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
625618
set(SWIFT_HOST_VARIANT_SDK_default "OSX")
@@ -684,7 +677,7 @@ endif()
684677

685678
# FIXME: the parameters we specify in SWIFT_SDKS are lacking architecture specifics,
686679
# so we need to hard-code it. For example, the SDK for Android is just 'ANDROID',
687-
# and we have to specify SWIFT_SDK_ANDROID_ARCHITECTURES separately.
680+
# which we assume below to be armv7.
688681
# The iOS SDKs all have their architectures hardcoded because they are just specified by name (e.g. 'IOS' or 'WATCHOS').
689682
# We can't cross-compile the standard library for another linux architecture,
690683
# because the SDK list would just be 'LINUX' and we couldn't disambiguate it from the host.
@@ -746,16 +739,9 @@ elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "HAIKU")
746739
elseif("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "ANDROID")
747740

748741
set(SWIFT_HOST_VARIANT "android" CACHE STRING
749-
"Deployment OS for Swift host tools (the compiler) [android]")
742+
"Deployment OS for Swift host tools (the compiler) [android].")
750743

751-
set(SWIFT_ANDROID_NATIVE_SYSROOT "/data/data/com.termux/files" CACHE STRING
752-
"Path to Android sysroot, default initialized to the Termux app's layout")
753-
754-
if("${SWIFT_SDK_ANDROID_ARCHITECTURES}" STREQUAL "")
755-
set(SWIFT_SDK_ANDROID_ARCHITECTURES ${SWIFT_HOST_VARIANT_ARCH})
756-
endif()
757-
758-
configure_sdk_unix("Android" "${SWIFT_SDK_ANDROID_ARCHITECTURES}")
744+
configure_sdk_unix("Android" "${SWIFT_HOST_VARIANT_ARCH}")
759745
set(SWIFT_PRIMARY_VARIANT_SDK_default "${SWIFT_HOST_VARIANT_SDK}")
760746
set(SWIFT_PRIMARY_VARIANT_ARCH_default "${SWIFT_HOST_VARIANT_ARCH}")
761747

‎branches/master-next/cmake/modules/AddSwift.cmake

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ function(_add_variant_c_compile_link_flags)
140140
# lld can handle targeting the android build. However, if lld is not
141141
# enabled, then fallback to the linker included in the android NDK.
142142
if(NOT SWIFT_ENABLE_LLD_LINKER)
143-
swift_android_tools_path(${CFLAGS_ARCH} tools_path)
144-
list(APPEND result "-B" "${tools_path}")
143+
list(APPEND result "-B" "${SWIFT_SDK_ANDROID_ARCH_${CFLAGS_ARCH}_NDK_PREBUILT_PATH}/${SWIFT_SDK_ANDROID_ARCH_${CFLAGS_ARCH}_NDK_TRIPLE}/bin")
145144
endif()
146145
endif()
147146

@@ -483,9 +482,22 @@ function(_add_variant_link_flags)
483482
# We need to add the math library, which is linked implicitly by libc++
484483
list(APPEND result "-lm")
485484

485+
if("${LFLAGS_ARCH}" MATCHES armv7)
486+
set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a")
487+
elseif("${LFLAGS_ARCH}" MATCHES aarch64)
488+
set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/arm64-v8a")
489+
elseif("${LFLAGS_ARCH}" MATCHES i686)
490+
set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/x86")
491+
elseif("${LFLAGS_ARCH}" MATCHES x86_64)
492+
set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/x86_64")
493+
else()
494+
message(SEND_ERROR "unknown architecture (${LFLAGS_ARCH}) for android")
495+
endif()
496+
486497
# link against the custom C++ library
487-
swift_android_cxx_libraries_for_arch(${LFLAGS_ARCH} cxx_link_libraries)
488-
list(APPEND link_libraries ${cxx_link_libraries})
498+
list(APPEND link_libraries
499+
${android_libcxx_path}/libc++abi.a
500+
${android_libcxx_path}/libc++_shared.so)
489501

490502
# link against the ICU libraries
491503
list(APPEND link_libraries
@@ -1092,7 +1104,7 @@ function(_add_swift_library_single target name)
10921104
set_target_properties("${target}"
10931105
PROPERTIES
10941106
INSTALL_NAME_DIR "${install_name_dir}")
1095-
elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "LINUX")
1107+
elseif("${SWIFTLIB_SINGLE_SDK}" STREQUAL "LINUX" AND NOT "${SWIFTLIB_SINGLE_SDK}" STREQUAL "ANDROID")
10961108
set_target_properties("${target}"
10971109
PROPERTIES
10981110
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/linux")
@@ -1104,14 +1116,6 @@ function(_add_swift_library_single target name)
11041116
# CMake generates incorrect rule `$SONAME_FLAG $INSTALLNAME_DIR$SONAME` for Android build on macOS cross-compile host.
11051117
# Proper linker flags constructed manually. See below variable `swiftlib_link_flags_all`.
11061118
set_target_properties("${target}" PROPERTIES NO_SONAME TRUE)
1107-
# Only set the install RPATH if cross-compiling the host tools, in which
1108-
# case both the NDK and Sysroot paths must be set.
1109-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "" AND
1110-
NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
1111-
set_target_properties("${target}"
1112-
PROPERTIES
1113-
INSTALL_RPATH "$ORIGIN")
1114-
endif()
11151119
endif()
11161120

11171121
set_target_properties("${target}" PROPERTIES BUILD_WITH_INSTALL_RPATH YES)

‎branches/master-next/cmake/modules/AddSwiftUnittests.cmake

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,9 @@ function(add_swift_unittest test_dirname)
4242
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
4343
set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
4444
LINK_FLAGS " -Xlinker -rpath -Xlinker ${SWIFT_LIBRARY_OUTPUT_INTDIR}/swift/macosx")
45-
elseif("${SWIFT_HOST_VARIANT}" STREQUAL "android")
46-
swift_android_lib_for_arch(${SWIFT_HOST_VARIANT_ARCH} android_system_libs)
47-
set_property(TARGET "${test_dirname}" APPEND PROPERTY LINK_DIRECTORIES
48-
"${android_system_libs}")
49-
set_property(TARGET "${test_dirname}" APPEND PROPERTY LINK_LIBRARIES "log")
5045
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
51-
set_property(TARGET "${test_dirname}" APPEND PROPERTY LINK_LIBRARIES
52-
"atomic")
46+
set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
47+
LINK_FLAGS " -latomic")
5348
endif()
5449

5550
find_program(LDLLD_PATH "ld.lld")

‎branches/master-next/cmake/modules/SwiftAndroidSupport.cmake

Lines changed: 18 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,16 @@
11
function(swift_android_libcxx_include_paths var)
2-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
3-
set(${var}
4-
"${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/include"
5-
"${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++abi/include"
6-
PARENT_SCOPE)
7-
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
8-
set(${var}
9-
"${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/include/c++/v1"
10-
PARENT_SCOPE)
11-
else()
12-
message(SEND_ERROR "Couldn't set libc++ include paths for Android")
13-
endif()
2+
set(${var}
3+
"${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/include"
4+
"${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++abi/include"
5+
PARENT_SCOPE)
146
endfunction()
157

168
function(swift_android_include_for_arch arch var)
179
set(paths)
18-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
19-
list(APPEND paths
20-
"${SWIFT_ANDROID_NDK_PATH}/sources/android/support/include"
21-
"${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include"
22-
"${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}")
23-
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
24-
list(APPEND paths
25-
"${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/include"
26-
"${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/include/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}")
27-
else()
28-
message(SEND_ERROR "Couldn't set ${arch} include paths for Android")
29-
endif()
10+
list(APPEND paths
11+
"${SWIFT_ANDROID_NDK_PATH}/sources/android/support/include"
12+
"${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include"
13+
"${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}")
3014
set(${var} ${paths} PARENT_SCOPE)
3115
endfunction()
3216

@@ -35,68 +19,18 @@ function(swift_android_lib_for_arch arch var)
3519
set(_host "${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}")
3620

3721
set(paths)
38-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
39-
if(arch STREQUAL armv7)
40-
list(APPEND paths "${_prebuilt}/${_host}/lib/armv7-a")
41-
elseif(arch STREQUAL aarch64)
42-
list(APPEND paths "${_prebuilt}/${_host}/lib64")
43-
elseif(arch STREQUAL i686)
44-
list(APPEND paths "${_prebuilt}/${_host}/lib")
45-
elseif(arch STREQUAL x86_64)
46-
list(APPEND paths "${_prebuilt}/${_host}/lib64")
47-
else()
48-
message(SEND_ERROR "unknown architecture (${arch}) for android")
49-
endif()
50-
list(APPEND paths "${_prebuilt}/lib/gcc/${_host}/${SWIFT_ANDROID_NDK_GCC_VERSION}.x")
51-
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
52-
list(APPEND paths "${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/lib")
53-
if("${arch}" MATCHES armv7)
54-
list(APPEND paths "/system/lib")
55-
elseif("${arch}" MATCHES aarch64)
56-
list(APPEND paths "/system/lib64")
57-
else()
58-
message(SEND_ERROR "unknown architecture (${arch}) when compiling for Android host")
59-
endif()
22+
if(arch STREQUAL armv7)
23+
list(APPEND paths "${_prebuilt}/${_host}/lib/armv7-a")
24+
elseif(arch STREQUAL aarch64)
25+
list(APPEND paths "${_prebuilt}/${_host}/lib64")
26+
elseif(arch STREQUAL i686)
27+
list(APPEND paths "${_prebuilt}/${_host}/lib")
28+
elseif(arch STREQUAL x86_64)
29+
list(APPEND paths "${_prebuilt}/${_host}/lib64")
6030
else()
61-
message(SEND_ERROR "Couldn't set ${arch} library paths for Android")
31+
message(SEND_ERROR "unknown architecture (${arch}) for android")
6232
endif()
33+
list(APPEND paths "${_prebuilt}/lib/gcc/${_host}/${SWIFT_ANDROID_NDK_GCC_VERSION}.x")
6334

6435
set(${var} ${paths} PARENT_SCOPE)
6536
endfunction()
66-
67-
function(swift_android_tools_path arch path_var_name)
68-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
69-
set(${path_var_name} "${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_PREBUILT_PATH}/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}/bin" PARENT_SCOPE)
70-
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
71-
set(${path_var_name} "${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/bin" PARENT_SCOPE)
72-
else()
73-
message(SEND_ERROR "Couldn't set ${arch} tools path for Android")
74-
endif()
75-
endfunction ()
76-
77-
function(swift_android_cxx_libraries_for_arch arch libraries_var_name)
78-
set(link_libraries)
79-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
80-
if("${arch}" MATCHES armv7)
81-
set(cxx_arch armeabi-v7a)
82-
elseif("${arch}" MATCHES aarch64)
83-
set(cxx_arch arm64-v8a)
84-
elseif("${arch}" MATCHES i686)
85-
set(cxx_arch x86)
86-
elseif("${arch}" MATCHES x86_64)
87-
set(cxx_arch x86_64)
88-
else()
89-
message(SEND_ERROR "unknown architecture (${arch}) when cross-compiling for Android")
90-
endif()
91-
92-
set(android_libcxx_path "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/libs/${cxx_arch}")
93-
list(APPEND link_libraries ${android_libcxx_path}/libc++abi.a
94-
${android_libcxx_path}/libc++_shared.so)
95-
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
96-
list(APPEND link_libraries "${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/lib/libc++_shared.so")
97-
else()
98-
message(SEND_ERROR "Couldn't set ${arch} libc++ libraries needed for Android")
99-
endif()
100-
101-
set(${libraries_var_name} ${link_libraries} PARENT_SCOPE)
102-
endfunction()

‎branches/master-next/cmake/modules/SwiftConfigureSDK.cmake

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ function(_report_sdk prefix)
4747
message(STATUS " ${arch} LIB: ${${arch}_LIB}")
4848
endforeach()
4949
elseif("${prefix}" STREQUAL "ANDROID")
50-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
51-
message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
52-
endif()
53-
if(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
54-
message(STATUS " Sysroot: ${SWIFT_ANDROID_NATIVE_SYSROOT}")
55-
endif()
50+
message(STATUS " NDK: $ENV{SWIFT_ANDROID_NDK_PATH}")
5651
foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
5752
swift_android_include_for_arch(${arch} ${arch}_INCLUDE)
5853
swift_android_lib_for_arch(${arch} ${arch}_LIB)
@@ -209,37 +204,18 @@ macro(configure_sdk_unix name architectures)
209204

210205
foreach(arch ${architectures})
211206
if("${prefix}" STREQUAL "ANDROID")
212-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
213-
set(SWIFT_SDK_ANDROID_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY "${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include" CACHE STRING "Path to C library headers")
214-
set(SWIFT_SDK_ANDROID_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include" CACHE STRING "Path to C library architecture headers")
215-
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
216-
set(SWIFT_SDK_ANDROID_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY "${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/include" CACHE STRING "Path to C library headers")
217-
set(SWIFT_SDK_ANDROID_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_ANDROID_NATIVE_SYSROOT}/usr/include" CACHE STRING "Path to C library architecture headers")
218-
else()
219-
message(SEND_ERROR "Couldn't find LIBC_INCLUDE_DIRECTORY for Android")
220-
endif()
207+
set(SWIFT_SDK_ANDROID_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY "${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include" CACHE STRING "Path to C library headers")
208+
set(SWIFT_SDK_ANDROID_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include" CACHE STRING "Path to C library architecture headers")
221209

222210
if("${arch}" STREQUAL "armv7")
223211
set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "arm-linux-androideabi")
224212
set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "arm")
225-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
226-
set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NDK_PATH}/platforms/android-${SWIFT_ANDROID_API_LEVEL}/arch-arm")
227-
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
228-
set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NATIVE_SYSROOT}")
229-
else()
230-
message(SEND_ERROR "Couldn't find SWIFT_SDK_ANDROID_ARCH_armv7_PATH")
231-
endif()
213+
set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NDK_PATH}/platforms/android-${SWIFT_ANDROID_API_LEVEL}/arch-arm")
232214
set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "armv7-none-linux-androideabi")
233215
elseif("${arch}" STREQUAL "aarch64")
234216
set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "aarch64-linux-android")
235217
set(SWIFT_SDK_ANDROID_ARCH_${arch}_ALT_SPELLING "aarch64")
236-
if(NOT "${SWIFT_ANDROID_NDK_PATH}" STREQUAL "")
237-
set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NDK_PATH}/platforms/android-${SWIFT_ANDROID_API_LEVEL}/arch-arm64")
238-
elseif(NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")
239-
set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NATIVE_SYSROOT}")
240-
else()
241-
message(SEND_ERROR "Couldn't find SWIFT_SDK_ANDROID_ARCH_aarch64_PATH")
242-
endif()
218+
set(SWIFT_SDK_ANDROID_ARCH_${arch}_PATH "${SWIFT_ANDROID_NDK_PATH}/platforms/android-${SWIFT_ANDROID_API_LEVEL}/arch-arm64")
243219
set(SWIFT_SDK_ANDROID_ARCH_${arch}_TRIPLE "aarch64-unknown-linux-android")
244220
elseif("${arch}" STREQUAL "i686")
245221
set(SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE "i686-linux-android")

‎branches/master-next/docs/DebuggingTheCompiler.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ diagnostic engine to assert on the first error/warning:
8686
These allow one to dump a stack trace of where the diagnostic is being emitted
8787
(if run without a debugger) or drop into the debugger if a debugger is attached.
8888

89-
Finding Diagnostic Names
90-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
91-
92-
Some diagnostics rely heavily on format string arguments, so it can be difficult
93-
to find their implementation by searching for parts of the emitted message in
94-
the codebase. To print the corresponding diagnostic name at the end of each
95-
emitted message, use the ``-Xfrontend -debug-diagnostic-names`` argument.
96-
9789
Debugging the Type Checker
9890
--------------------------
9991

‎branches/master-next/docs/GenericsManifesto.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ Unlike the minor extensions, major extensions to the generics model provide more
283283

284284
### Conditional conformances (*)
285285

286-
*This feature has been accepted in [SE-0143](https://github.com/apple/swift-evolution/blob/master/proposals/0143-conditional-conformances.md) and is implemented in Swift 4.2.*
286+
*This feature has been accepted in [SE-0143](https://github.com/apple/swift-evolution/blob/master/proposals/0143-conditional-conformances.md) and is under development.*
287287

288288
Conditional conformances express the notion that a generic type will conform to a particular protocol only under certain circumstances. For example, `Array` is `Equatable` only when its elements are `Equatable`:
289289

0 commit comments

Comments
 (0)