diff options
| author |  cparsons <cparsons@google.com> | 2017-11-28 14:07:24 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-28 14:09:31 -0800 |
| commit | 854b6c58039f8213acc044cb4e24d1d7811ffb05 (patch) | |
| tree | f91dc96bee27ef62b0c849b2adc88b32b475b798 /src/test/java | |
| parent | 801109f1e30607bd57ca42dac0cf60b75e8a7831 (diff) | |
Eliminate STATIC_FRAMEWORK_DIR as a separate field of ObjcProvider.
Infer those values from STATIC_FRAMEWORK_FILE.
This correctly dedupes static frameworks between an app and its dylibs.
RELNOTES: None.
PiperOrigin-RevId: 177214770
Diffstat (limited to 'src/test/java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkTest.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkTest.java index 6e90760563..c3a64ae569 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcFrameworkTest.java @@ -19,7 +19,6 @@ import static com.google.devtools.build.lib.rules.objc.ObjcCommon.FRAMEWORK_CONT import static com.google.devtools.build.lib.rules.objc.ObjcCommon.NOT_IN_CONTAINER_ERROR_FORMAT; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.SDK_DYLIB; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.SDK_FRAMEWORK; -import static com.google.devtools.build.lib.rules.objc.ObjcProvider.STATIC_FRAMEWORK_DIR; import static com.google.devtools.build.lib.rules.objc.ObjcProvider.WEAK_SDK_FRAMEWORK; import com.google.common.collect.ImmutableList; @@ -52,7 +51,7 @@ public class ObjcFrameworkTest extends ObjcRuleTestCase { public void testProvidesFilesAndDirs_static() throws Exception { addBinWithTransitiveDepOnFrameworkImport(); ObjcProvider provider = providerForTarget("//fx:fx"); - assertThat(provider.get(STATIC_FRAMEWORK_DIR)) + assertThat(provider.getStaticFrameworkDirs()) .containsExactly( PathFragment.create("fx/fx1.framework"), PathFragment.create("fx/fx2.framework")); @@ -94,7 +93,7 @@ public class ObjcFrameworkTest extends ObjcRuleTestCase { getSourceArtifact("fx/fx1.framework/b"), getSourceArtifact("fx/fx2.framework/c"), getSourceArtifact("fx/fx2.framework/d")); - assertThat(provider.get(ObjcProvider.STATIC_FRAMEWORK_DIR)).isEmpty(); + assertThat(provider.getStaticFrameworkDirs()).isEmpty(); assertThat(provider.get(ObjcProvider.STATIC_FRAMEWORK_FILE)).isEmpty(); } |