---

yaml
---
r: 317055
b: refs/heads/master-rebranch
c: 7c4b176
h: refs/heads/master
i:
  317053: f16a2a6
  317051: ad3475c
  317047: 944d3e3
  317039: 9eb2d21
  317023: a8dd3a5
  316991: 68e5d23
  316927: b8f4d48

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 20393bcc954110244b763f811f1ba6616775a8c1
+refs/heads/master-rebranch: 7c4b1768e8028b252b0e252091243800b266f558

branches/master-rebranch/cmake/modules/AddSwift.cmake

@@ -298,8 +298,9 @@ function(_add_variant_c_compile_flags)
   endif()
 
   if("${CFLAGS_SDK}" STREQUAL "ANDROID")
+    swift_android_libcxx_include_paths(CFLAGS_CXX_INCLUDES)
     swift_android_include_for_arch("${CFLAGS_ARCH}" "${CFLAGS_ARCH}_INCLUDE")
-    foreach(path IN LISTS ${CFLAGS_ARCH}_INCLUDE)
+    foreach(path IN LISTS CFLAGS_CXX_INCLUDES ${CFLAGS_ARCH}_INCLUDE)
       list(APPEND result "\"${CMAKE_INCLUDE_FLAG_C}${path}\"")
     endforeach()
     list(APPEND result "-D__ANDROID_API__=${SWIFT_ANDROID_API_LEVEL}")

branches/master-rebranch/cmake/modules/SwiftAndroidSupport.cmake

@@ -1,8 +1,13 @@
+function(swift_android_libcxx_include_paths var)
+  set(${var}
+        "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/include"
+        "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++abi/include"
+      PARENT_SCOPE)
+endfunction()
+
 function(swift_android_include_for_arch arch var)
   set(paths)
   list(APPEND paths
-       "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++/include"
-       "${SWIFT_ANDROID_NDK_PATH}/sources/cxx-stl/llvm-libc++abi/include"
        "${SWIFT_ANDROID_NDK_PATH}/sources/android/support/include"
        "${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include"
        "${SWIFT_ANDROID_NDK_PATH}/sysroot/usr/include/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}")