Merge branch 'master' into patch-1

This commit is contained in:
Marcel Hlopko 2019-11-07 09:22:11 +01:00 committed by GitHub
commit 63bcda396d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions

View File

@ -38,6 +38,12 @@ constraint_value(
constraint_setting = ":os", constraint_setting = ":os",
) )
# For platforms with no OS, like microcontrollers.
constraint_value(
name = "none",
constraint_setting = ":os",
)
### Apple OS Values ### Apple OS Values
constraint_value( constraint_value(
@ -51,6 +57,11 @@ constraint_value(
constraint_setting = ":os", constraint_setting = ":os",
) )
alias(
name = "macos",
actual = ":osx",
)
constraint_value( constraint_value(
name = "tvos", name = "tvos",
constraint_setting = ":os", constraint_setting = ":os",
@ -60,3 +71,8 @@ constraint_value(
name = "watchos", name = "watchos",
constraint_setting = ":os", constraint_setting = ":os",
) )
constraint_value(
name = "qnx",
constraint_setting = ":os",
)