aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
diff options
context:
space:
mode:
authorGravatar schmitt <schmitt@google.com>2017-06-02 14:50:01 -0400
committerGravatar John Cater <jcater@google.com>2017-06-05 10:18:52 -0400
commit85b0ad2541af8927e87c78e59b156e4f0abca994 (patch)
treec553144d13ecb8b8a17caad8c0aaa9dd2b474755 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
parentd3581d28b53d0180802b9947ba1e440712419735 (diff)
Remove Xcodege integration from Blaze.
RELNOTES: None. PiperOrigin-RevId: 157857216
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
index 5b57a41498..1594ac7def 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
@@ -15,7 +15,6 @@
package com.google.devtools.build.lib.rules.objc;
import static com.google.devtools.build.lib.packages.BuildType.LABEL;
-import static com.google.devtools.build.lib.rules.cpp.Link.LINK_LIBRARY_FILETYPES;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.ASSET_CATALOG;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.BUNDLE_FILE;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.BUNDLE_IMPORT_DIR;
@@ -26,7 +25,6 @@ import static com.google.devtools.build.lib.rules.objc.ObjcProvider.DEFINE;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.DYNAMIC_FRAMEWORK_DIR;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.DYNAMIC_FRAMEWORK_FILE;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.FLAG;
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.FORCE_LOAD_FOR_XCODEGEN;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.FORCE_LOAD_LIBRARY;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.Flag.USES_CPP;
import static com.google.devtools.build.lib.rules.objc.ObjcProvider.GENERAL_RESOURCE_DIR;
@@ -75,11 +73,11 @@ import com.google.devtools.build.lib.rules.cpp.CcLinkParams;
import com.google.devtools.build.lib.rules.cpp.CcLinkParamsProvider;
import com.google.devtools.build.lib.rules.cpp.CppCompilationContext;
import com.google.devtools.build.lib.rules.cpp.CppModuleMap;
-import com.google.devtools.build.lib.rules.cpp.LinkerInputs;
import com.google.devtools.build.lib.syntax.Type;
import com.google.devtools.build.lib.util.FileType;
import com.google.devtools.build.lib.util.Preconditions;
import com.google.devtools.build.lib.vfs.PathFragment;
+
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -457,15 +455,6 @@ public final class ObjcCommon {
.addAll(SDK_FRAMEWORK, frameworkLinkOpts.build())
.addAll(LINKOPT, nonFrameworkLinkOpts.build())
.addTransitiveAndPropagate(CC_LIBRARY, params.getLibraries());
-
- for (LinkerInputs.LibraryToLink library : params.getLibraries()) {
- Artifact artifact = library.getArtifact();
- if (LINK_LIBRARY_FILETYPES.matches(artifact.getFilename())) {
- objcProvider.add(
- FORCE_LOAD_FOR_XCODEGEN,
- "$(WORKSPACE_ROOT)/" + artifact.getExecPath().getSafePathString());
- }
- }
}
if (compilationAttributes.isPresent()) {
@@ -550,18 +539,10 @@ public final class ObjcCommon {
for (CompilationArtifacts artifacts : compilationArtifacts.asSet()) {
for (Artifact archive : artifacts.getArchive().asSet()) {
objcProvider.add(FORCE_LOAD_LIBRARY, archive);
- objcProvider.add(
- FORCE_LOAD_FOR_XCODEGEN,
- String.format(
- "$(BUILT_PRODUCTS_DIR)/lib%s.a",
- XcodeProvider.xcodeTargetName(context.getLabel())));
}
}
for (Artifact archive : extraImportLibraries) {
objcProvider.add(FORCE_LOAD_LIBRARY, archive);
- objcProvider.add(
- FORCE_LOAD_FOR_XCODEGEN,
- "$(WORKSPACE_ROOT)/" + archive.getExecPath().getSafePathString());
}
}