diff options
| author |  Chris Parsons <cparsons@google.com> | 2017-02-24 00:00:59 +0000 |
|---|---|---|
| committer |  Irina Iancu <elenairina@google.com> | 2017-02-24 08:31:04 +0000 |
| commit | 5e945570ec0b9079596756bf89437ac37e031c36 (patch) | |
| tree | f6e273b0aad77c8acda6415f0608bf32dedf3442 /src/main/java/com/google/devtools/build/lib/rules/apple | |
| parent | cd66f96c8e214d8f67eb017c85e4ee8d8f11a848 (diff) | |
Rollforward of "apple_binary extension_safe attribute results in configuration transition on dependencies"
This includes a fix:
Propagate iquote appropriately from apple_binary so that generated headers of xctest apps are seen by ios_test
--
PiperOrigin-RevId: 148403601
MOS_MIGRATED_REVID=148403601
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/apple')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java index a9f45cf394..ad5e8abed6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java @@ -706,12 +706,18 @@ public class AppleConfiguration extends BuildConfiguration.Fragment { FRAMEWORK("framework"), /** Split transition distinguisher for {@code apple_watch1_extension} rule. */ WATCH_OS1_EXTENSION("watch_os1_extension"), - /** Distinguisher for {@code apple_binary} rule with "ios" platform_type. */ + /** Distinguisher for non-extension {@code apple_binary} rule with "ios" platform_type. */ APPLEBIN_IOS("applebin_ios"), - /** Distinguisher for {@code apple_binary} rule with "watchos" platform_type. */ + /** Distinguisher for non-extension {@code apple_binary} rule with "watchos" platform_type. */ APPLEBIN_WATCHOS("applebin_watchos"), - /** Distinguisher for {@code apple_binary} rule with "tvos" platform_type. */ + /** Distinguisher for non-extension {@code apple_binary} rule with "tvos" platform_type. */ APPLEBIN_TVOS("applebin_tvos"), + /** Distinguisher for extension {@code apple_binary} rule with "ios" platform_type. */ + APPLEBIN_IOS_EXT("applebin_ios_ext"), + /** Distinguisher for extension {@code apple_binary} rule with "watchos" platform_type. */ + APPLEBIN_WATCHOS_EXT("applebin_watchos_ext"), + /** Distinguisher for extension {@code apple_binary} rule with "tvos" platform_type. */ + APPLEBIN_TVOS_EXT("applebin_tvos_ext"), /** * Distinguisher for the apple crosstool configuration. We use "apl" for output directory * names instead of "apple_crosstool" to avoid oversized path names, which can be problematic |