Merge branch 'master' into noinfo

bazelbuild · Nov 15, 2023 · 480679a · 480679a
2 parents ae34ad0 + d4c9dcc
commit 480679a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/generatetables/generate_tables.go b/generatetables/generate_tables.go
@@ -74,12 +74,19 @@ func generateTable(rules []*buildpb.RuleDefinition) map[string]buildpb.Attribute
 	types["default_copts"] = types["copts"]
 	types["default_deprecation"] = types["deprecation"]
 	types["default_testonly"] = types["testonly"]
-	types["default_applicable_licenses"] = types["applicable_licenses"]
+	types["default_applicable_licenses"] = buildpb.Attribute_LABEL_LIST
+	types["default_package_metadata"] = buildpb.Attribute_LABEL_LIST
 	types["features"] = buildpb.Attribute_STRING_LIST
 
 	types["extra_srcs"] = types["srcs"]
 	types["pytype_deps"] = types["deps"]
 
+	// Make sure we always have this.
+	_, ok := types["package_metadata"]
+	if ! ok {
+		types["package_metadata"] = buildpb.Attribute_LABEL_LIST
+	}
+
 	return types
 }
 

diff --git a/lang/tables.gen.go b/lang/tables.gen.go
@@ -187,6 +187,7 @@ var TypeOf = map[string]buildpb.Attribute_Discriminator{
 	"default_hdrs_check":	buildpb.Attribute_STRING,
 	"default_ios_sdk_version":	buildpb.Attribute_STRING,
 	"default_macos_sdk_version":	buildpb.Attribute_STRING,
+	"default_package_metadata":	buildpb.Attribute_LABEL_LIST,
 	"default_properties":	buildpb.Attribute_LABEL,
 	"default_testonly":	buildpb.Attribute_BOOLEAN,
 	"default_tvos_sdk_version":	buildpb.Attribute_STRING,
@@ -325,6 +326,7 @@ var TypeOf = map[string]buildpb.Attribute_Discriminator{
 	"output_to_bindir":	buildpb.Attribute_BOOLEAN,
 	"outs":	buildpb.Attribute_STRING_LIST,
 	"package_configuration":	buildpb.Attribute_LABEL_LIST,
+	"package_metadata":	buildpb.Attribute_LABEL_LIST,
 	"packages":	buildpb.Attribute_LABEL_LIST,
 	"parents":	buildpb.Attribute_LABEL_LIST,
 	"path":	buildpb.Attribute_STRING,