Merge pull request swiftlang#24547 from drodriguez/android-remove-uuid-from-glibc

drodriguez · web-flow · commit 47be3d68bd05 · 2019-05-07T10:58:44.000-07:00
[android] Remove uuid.h from Android's Glibc.
diff --git a/stdlib/public/Platform/glibc.modulemap.gyb b/stdlib/public/Platform/glibc.modulemap.gyb
@@ -528,8 +528,10 @@ module SwiftGlibc [system] {
   }
 }
 
+% if CMAKE_SDK != "ANDROID":
 module CUUID [system] {
   header "${GLIBC_INCLUDE_PATH}/uuid/uuid.h"
   link "uuid"
   export *
 }
+% end

Original file line number	Diff line number	Diff line change
`@@ -528,8 +528,10 @@ module SwiftGlibc [system] {`
`528`	`528`	`}`
`529`	`529`	`}`
`530`	`530`
	`531`	`+% if CMAKE_SDK != "ANDROID":`
`531`	`532`	`module CUUID [system] {`
`532`	`533`	`header "${GLIBC_INCLUDE_PATH}/uuid/uuid.h"`
`533`	`534`	`link "uuid"`
`534`	`535`	`export *`
`535`	`536`	`}`
	`537`	`+% end`