diff options
| author |  cpeyser <cpeyser@google.com> | 2017-05-04 22:39:06 +0200 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2017-05-04 23:06:21 +0200 |
| commit | 435f882fd36507ee7393cc9385e3460fdc166791 (patch) | |
| tree | 898a0f82810627b91bd220e16117e80263e69fe9 /src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java | |
| parent | 3c56d6ac11378d57206550094f5fece0380d9c0b (diff) | |
Retire the experimental_objc_library rule and --experimental_objc_library flag.
Re-organize ObjcLibraryTest and ExperimentalObjcLibraryTest ->
LegacyObjcLibraryTest and CrosstoolObjcLibraryTest, according to the pattern used in
the other unit tests.
PiperOrigin-RevId: 155120143
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java | 4 |
1 files changed, 1 insertions, 3 deletions
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 6f3925e6c6..720f09cbb1 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 @@ -77,7 +77,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { @Nullable private final Label extraEntitlements; private final boolean deviceDebugEntitlements; private final ObjcCrosstoolMode objcCrosstoolMode; - private final boolean experimentalObjcLibrary; private final boolean enableAppleBinaryNativeProtos; private final HeaderDiscovery.DotdPruningMode dotdPruningPlan; private final boolean experimentalHeaderThinning; @@ -117,7 +116,6 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { this.extraEntitlements = objcOptions.extraEntitlements; this.deviceDebugEntitlements = objcOptions.deviceDebugEntitlements; this.objcCrosstoolMode = objcOptions.objcCrosstoolMode; - this.experimentalObjcLibrary = objcOptions.experimentalObjcLibrary; this.enableAppleBinaryNativeProtos = objcOptions.enableAppleBinaryNativeProtos; this.dotdPruningPlan = objcOptions.useDotdPruning @@ -344,7 +342,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment { * CROSSTOOL is used for objc in this configuration. */ public ObjcCrosstoolMode getObjcCrosstoolMode() { - return experimentalObjcLibrary ? ObjcCrosstoolMode.LIBRARY : objcCrosstoolMode; + return objcCrosstoolMode; } /** Returns true if apple_binary targets should generate and link Objc protos. */ |