From 04dbe1885b58eeeca00880fb9d82ae4c2d98da52 Mon Sep 17 00:00:00 2001 From: Cal Peyser Date: Fri, 12 Feb 2016 16:36:27 +0000 Subject: Rollback of commit 60434dae746ed61f025fdfd0464993fa6a0ff1d2. -- MOS_MIGRATED_REVID=114537166 --- .../build/lib/rules/objc/XcTestAppProvider.java | 52 +--------------------- 1 file changed, 1 insertion(+), 51 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java index 899ab0b3c3..3d47454e2e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/XcTestAppProvider.java @@ -27,36 +27,11 @@ public final class XcTestAppProvider implements TransitiveInfoProvider { private final Artifact bundleLoader; private final Artifact ipa; private final ObjcProvider objcProvider; - private final Iterable linkedLibraries; - private final Iterable linkedImportedLibraries; - private final Iterable forceLoadLibraries; - /** - * Constructs XcTestAppProvider. - * - * @param bundleLoader the bundle loader to be passed into the linker of the test binary - * @param ipa the bundled test application - * @param objcProvider an objcProvider to be passed to the depending IosTest target - * @param linkedLibraries libraries already linked into the test application, that should not be - * linked into the IosTest binary - * @param linkedImportedLibraries imported Libraries already linked into the test application, - * that should not be linked into the IosTest binary - * @param forceLoadLibraries libraries already linked into the test application with --force_load - * that should not be linked into the IosTest binary - */ - XcTestAppProvider( - Artifact bundleLoader, - Artifact ipa, - ObjcProvider objcProvider, - Iterable linkedLibraries, - Iterable linkedImportedLibraries, - Iterable forceLoadLibraries) { + XcTestAppProvider(Artifact bundleLoader, Artifact ipa, ObjcProvider objcProvider) { this.bundleLoader = Preconditions.checkNotNull(bundleLoader); this.ipa = Preconditions.checkNotNull(ipa); this.objcProvider = Preconditions.checkNotNull(objcProvider); - this.linkedLibraries = linkedLibraries; - this.linkedImportedLibraries = linkedImportedLibraries; - this.forceLoadLibraries = forceLoadLibraries; } /** @@ -79,29 +54,4 @@ public final class XcTestAppProvider implements TransitiveInfoProvider { public ObjcProvider getObjcProvider() { return objcProvider; } - - /** - * Returns the list of libraries that were linked into the host application. These libraries - * should not also be linked into the test binary, so as to prevent ambiguous references. - */ - public Iterable getLinkedLibraries() { - return linkedLibraries; - } - - /** - * Returns the list of imported libraries that were linked into the host application. These - * libraries should not also be linked into the test binary, so as to - * prevent ambiguous references. - */ - public Iterable getLinkedImportedLibraries() { - return linkedImportedLibraries; - } - - /** - * Returns the list of libraries that were linked into the host application with the --force_load - * flag. - */ - public Iterable getForceLoadLibraries() { - return forceLoadLibraries; - } } -- cgit v1.2.3