Skip to content

Commit

Permalink
Automated rollback of commit c1be54b5d5daf8ed2ac17e7f49d297836572e13c.
Browse files Browse the repository at this point in the history
    *** Reason for rollback ***

    Failures in nightly: b/123841211

    *** Original change description ***

    Enable --incompatible_disable_objc_provider_resources by default.

    bazelbuild/bazel#5710

    RELNOTES: --incompatible_disable_objc_provider_resources is now enabled by default. This disables ObjcProvider's fields related to resource processing.
    PiperOrigin-RevId: 232305883
  • Loading branch information
Luca Di Grazia committed Sep 4, 2022
1 parent 0e7c3e6 commit 4c9502d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -327,14 +327,15 @@ public class SkylarkSemanticsOptions extends OptionsBase implements Serializable

@Option(
name = "incompatible_generate_javacommon_source_jar",
defaultValue = "true",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.SKYLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
OptionMetadataTag.INCOMPATIBLE_CHANGE,
OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
OptionMetadataTag.INCOMPATIBLE_CHANGE,
OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
},
help = "If set to true, java_common.compile will always generate an output source jar.")
help = "If set to true, java_common.compile will always generate an output source jar."
)
public boolean incompatibleGenerateJavaCommonSourceJar;

/** Controls legacy arguments to ctx.actions.Args#add. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public static Builder builderWithDefaults() {
.incompatibleDisallowLoadLabelsToCrossPackageBoundaries(false)
.incompatibleDisallowOldStyleArgsAdd(false)
.incompatibleExpandDirectories(true)
.incompatibleGenerateJavaCommonSourceJar(true)
.incompatibleGenerateJavaCommonSourceJar(false)
.incompatibleNewActionsApi(false)
.incompatibleNoAttrLicense(false)
.incompatibleNoOutputAttrDefault(false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import com.google.devtools.build.lib.rules.apple.DottedVersion;
import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.syntax.SkylarkSemantics;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.List;
import org.junit.Test;
Expand All @@ -43,7 +43,7 @@
@RunWith(JUnit4.class)
public class ObjcSkylarkTest extends ObjcRuleTestCase {
private static ObjcProvider.Builder objcProviderBuilder() {
return new ObjcProvider.Builder(StarlarkSemantics.DEFAULT_SEMANTICS);
return new ObjcProvider.Builder(SkylarkSemantics.DEFAULT_SEMANTICS);
}

@Test
Expand Down Expand Up @@ -1079,7 +1079,6 @@ public void testEmptyObjcProviderKeysArePresent() throws Exception {

@Test
public void testSkylarkCanAccessProvidedBundleFiles() throws Exception {
useConfiguration("--incompatible_disable_objc_library_resources=false");
// Since the collections of structs with Artifact values are extremely difficult to test with
// Truth, we fudge them in the Skylark side to return easily comparable dictionaries instead.
scratch.file("examples/rule/BUILD");
Expand Down

0 comments on commit 4c9502d

Please sign in to comment.