diff options
| author |  Dmitry Shevchenko <dmishe@google.com> | 2017-01-11 16:38:23 +0000 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-01-12 09:09:28 +0000 |
| commit | fca2d6ac839dd64c508510b708aea2b049bcc1a2 (patch) | |
| tree | 60807a74a787fd5bd5d18b2ca36c83170c7a3d7c /src/test/java/com/google | |
| parent | db7a9ea7f6b2af3c4c1f43ad4aa50cd4eca02921 (diff) | |
Add SwiftConfiguration
* This new configuration allows for passthrough of Swift-specific options into Skylark for further consumption by swift_library. It also keeps things nicely isolated until we get a way to create configurations in Skylark directly.
--
PiperOrigin-RevId: 144210267
MOS_MIGRATED_REVID=144210267
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 1 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 2d56e883a5..ff7b4ebad3 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -346,6 +346,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/query2", "//src/main/java/com/google/devtools/build/lib/query2:query-output", "//src/main/java/com/google/devtools/build/lib/rules/apple", + "//src/main/java/com/google/devtools/build/lib/rules/apple/swift", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/lib/rules/genquery", "//src/main/java/com/google/devtools/build/lib/rules/objc", diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java index b2f17487f4..7a51a44530 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java @@ -29,6 +29,7 @@ import com.google.devtools.build.lib.packages.util.MockCcSupport; import com.google.devtools.build.lib.packages.util.MockToolsConfig; import com.google.devtools.build.lib.rules.android.AndroidConfiguration; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; +import com.google.devtools.build.lib.rules.apple.swift.SwiftConfiguration; import com.google.devtools.build.lib.rules.cpp.CppConfigurationLoader; import com.google.devtools.build.lib.rules.cpp.FdoSupportFunction; import com.google.devtools.build.lib.rules.cpp.FdoSupportValue; @@ -240,6 +241,7 @@ public final class BazelAnalysisMock extends AnalysisMock { new JavaConfigurationLoader(), new ObjcConfigurationLoader(), new AppleConfiguration.Loader(), + new SwiftConfiguration.Loader(), new J2ObjcConfiguration.Loader(), new ProtoConfiguration.Loader(), new AndroidConfiguration.Loader()); |