From 2d5eeab381713f99c8c8b7b80f3d447be847b548 Mon Sep 17 00:00:00 2001
From: cparsons <cparsons@google.com>
Date: Fri, 30 Jun 2017 00:00:18 +0200
Subject: Remove --xcode_override_workspace_root and
 --experimental_use_absolute_paths_for_actions.

These flags are old and unused -- with the deletion of xcodegen, addition of Tulsi, and near-migration to crosstool objc compilation, these flags are long-deprecated and are now cleaned up.

RELNOTES: None.
PiperOrigin-RevId: 160578161
---
 .../build/lib/rules/objc/ObjcConfiguration.java    | 33 ----------------------
 1 file changed, 33 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java')

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
index 720f09cbb1..bd67eff739 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
@@ -29,7 +29,6 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.util.Preconditions;
-import com.google.devtools.build.lib.vfs.Path;
 import javax.annotation.Nullable;
 
 /** A compiler configuration containing flags required for Objective-C compilation. */
@@ -69,9 +68,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   private final boolean enableBinaryStripping;
   private final boolean moduleMapsEnabled;
   @Nullable private final String signingCertName;
-  @Nullable private final Path clientWorkspaceRoot;
-  private final String xcodeOverrideWorkspaceRoot;
-  private final boolean useAbsolutePathsForActions;
   private final boolean prioritizeStaticLibs;
   private final boolean debugWithGlibcxx;
   @Nullable private final Label extraEntitlements;
@@ -107,10 +103,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
     this.fastbuildOptions = ImmutableList.copyOf(objcOptions.fastbuildOptions);
     this.enableBinaryStripping = objcOptions.enableBinaryStripping;
     this.moduleMapsEnabled = objcOptions.enableModuleMaps;
-    this.clientWorkspaceRoot = directories != null ? directories.getWorkspace() : null;
     this.signingCertName = objcOptions.iosSigningCertName;
-    this.xcodeOverrideWorkspaceRoot = objcOptions.xcodeOverrideWorkspaceRoot;
-    this.useAbsolutePathsForActions = objcOptions.useAbsolutePathsForActions;
     this.prioritizeStaticLibs = objcOptions.prioritizeStaticLibs;
     this.debugWithGlibcxx = objcOptions.debugWithGlibcxx;
     this.extraEntitlements = objcOptions.extraEntitlements;
@@ -270,32 +263,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
     return this.enableBinaryStripping && getCompilationMode() == CompilationMode.OPT;
   }
 
-  /**
-   * If true, all calls to actions are done with absolute paths instead of relative paths.
-   * Using absolute paths allows Xcode to debug and deal with blaze errors in the GUI properly.
-   */
-  public boolean getUseAbsolutePathsForActions() {
-    return this.useAbsolutePathsForActions;
-  }
-
-  /**
-   * Returns the path to be used for workspace_root (and path of pbxGroup mainGroup) in xcodeproj.
-   * This usually will be the absolute path of the root of Bazel client workspace or null if
-   * passed-in {@link BlazeDirectories} is null or Bazel fails to find the workspace root directory.
-   * It can also be overridden by the {@code --xcode_override_workspace_root} flag, in which case
-   * the path can be absolute or relative.
-   */
-  @Nullable
-  public String getXcodeWorkspaceRoot() {
-    if (!this.xcodeOverrideWorkspaceRoot.isEmpty()) {
-      return this.xcodeOverrideWorkspaceRoot;
-    }
-    if (this.clientWorkspaceRoot == null) {
-      return null;
-    }
-    return this.clientWorkspaceRoot.getPathString();
-  }
-
   /**
    * Returns the flag-supplied certificate name to be used in signing or {@code null} if no such
    * certificate was specified.
-- 
cgit v1.2.3