Move the starlark/* files to util/, point at local protos.
Move the current starlark/* to the location of the rest of the starlark
helper code in util/ and point proto usage at the locally path mounted
protos.
We never loved the starlark/ name but didn't come up with a better
alternative. Charles pushed back on not using a more descriptive name so
going with util/ for now.
BUG=chromium:1041872
TEST=generating from src/project/volteer/volteer
Change-Id: Ifad6acd5eddad4c49116a14fdc024a08b39e1a86
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/config/+/2056133
Reviewed-by: Andrew Lamb <andrewlamb@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: David Burger <dburger@chromium.org>
diff --git a/.gitignore b/.gitignore
index f24e103..9acd0c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
.cipd_bin
-starlark/bindings/descpb.bin
+util/bindings/descpb.bin
*_pb2.py
*.pyc
-# Ignore nested protocol buffer repos.
+# Ignore nested protocol buffer repos but include
+# direct protocol buffer definition directories.
proto/**/
!proto/api
diff --git a/generate.sh b/generate.sh
index 1197bab..625ae6b 100755
--- a/generate.sh
+++ b/generate.sh
@@ -31,6 +31,6 @@
protos=(proto/**/*.proto)
protos=( ${protos[@]/#/src/config/} )
-protoc -I../../ --descriptor_set_out=starlark/bindings/descpb.bin \
+protoc -I../../ --descriptor_set_out=util/bindings/descpb.bin \
--python_out=payload_utils/bindings \
"${protos[@]}"
diff --git a/starlark/proto.star b/util/bindings/proto.star
similarity index 90%
rename from starlark/proto.star
rename to util/bindings/proto.star
index adfd11b..5b27a30 100644
--- a/starlark/proto.star
+++ b/util/bindings/proto.star
@@ -10,6 +10,6 @@
protos = proto.new_descriptor_set(
name = "chromiumos",
- blob = io.read_file("bindings/descpb.bin"),
+ blob = io.read_file("descpb.bin"),
deps = [wellknown_descpb],
)
diff --git a/util/build_config.star b/util/build_config.star
index 9853ac0..2c10c96 100644
--- a/util/build_config.star
+++ b/util/build_config.star
@@ -1,13 +1,13 @@
-load("//config/proto/proto.star", "protos")
+load("//config/util/bindings/proto.star", "protos")
protos.register()
-load("@proto//src/config/api/build_config.proto", bc_pb = "chromiumos.config.api")
-load("@proto//src/platform2/chromeos-config/proto/identity_scan_config.proto", id_scan_pb = "chromeos_config")
-load("@proto//src/third_party/chromiumos-overlay/proto/audio_config.proto", audio_pb = "chromiumos_overlay")
-load("@proto//src/third_party/chromiumos-overlay/proto/build_target_id.proto", bt_id_pb = "chromiumos_overlay")
-load("@proto//src/third_party/chromiumos-overlay/proto/brand_config.proto", brand_pb = "chromiumos_overlay")
-load("@proto//src/third_party/chromiumos-overlay/proto/firmware_config.proto", fw_pb = "firmware")
-load("@proto//src/third_party/chromiumos-overlay/proto/design_config_build_payload.proto", bp_pb = "chromiumos_overlay")
+load("@proto//src/config/proto/api/build_config.proto", bc_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/chromeos-config/identity_scan_config.proto", id_scan_pb = "chromeos_config")
+load("@proto//src/config/proto/audio_config.proto", audio_pb = "chromiumos_config")
+load("@proto//src/config/proto/build_target_id.proto", bt_id_pb = "chromiumos_config")
+load("@proto//src/config/proto/brand_config.proto", brand_pb = "chromiumos_config")
+load("@proto//src/config/proto/firmware_config.proto", fw_pb = "firmware")
+load("@proto//src/config/proto/design_config_build_payload.proto", bp_pb = "chromiumos_config")
_FW_TYPE = struct(
MAIN = fw_pb.FirmwareType.MAIN,
diff --git a/util/component.star b/util/component.star
index 34a5a5d..8e5f89b 100644
--- a/util/component.star
+++ b/util/component.star
@@ -1,8 +1,8 @@
-load("//config/proto/proto.star", "protos")
+load("//config/util/bindings/proto.star", "protos")
protos.register()
-load("@proto//src/config/api/component.proto", comp_pb = "chromiumos.config.api")
-load("@proto//src/config/api/component_id.proto", comp_id_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/component.proto", comp_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/component_id.proto", comp_id_pb = "chromiumos.config.api")
def _create_soc_family(name, arch=comp_pb.Component.Soc.X86_64):
return comp_pb.Component.Soc.Family(
@@ -57,4 +57,4 @@
create_qual = _create_qual,
create_quals = _create_quals,
qual_status = _qual_status,
-)
\ No newline at end of file
+)
diff --git a/util/design.star b/util/design.star
index b4e30f2..f580e4f 100644
--- a/util/design.star
+++ b/util/design.star
@@ -1,9 +1,9 @@
-load("//config/proto/proto.star", "protos")
+load("//config/util/bindings/proto.star", "protos")
protos.register()
-load("@proto//src/config/api/design.proto", design_pb = "chromiumos.config.api")
-load("@proto//src/config/api/design_config_id.proto", config_id_pb = "chromiumos.config.api")
-load("@proto//src/config/api/design_id.proto", design_id_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/design.proto", design_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/design_config_id.proto", config_id_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/design_id.proto", design_id_pb = "chromiumos.config.api")
load("//config/util/hw_topology.star", hw_topo = "hw_topo")
diff --git a/util/hw_topology.star b/util/hw_topology.star
index 493a9bd..e47ea8b 100644
--- a/util/hw_topology.star
+++ b/util/hw_topology.star
@@ -1,9 +1,9 @@
-load("//config/proto/proto.star", "protos")
+load("//config/util/bindings/proto.star", "protos")
protos.register()
-load("@proto//src/config/api/topology.proto", topo_pb = "chromiumos.config.api")
-load("@proto//src/config/api/hardware_topology.proto", hw_topo_pb = "chromiumos.config.api")
-load("@proto//src/config/api/component.proto", comp_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/topology.proto", topo_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/hardware_topology.proto", hw_topo_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/component.proto", comp_pb = "chromiumos.config.api")
_FF = struct(
CLAMSHELL = topo_pb.HardwareFeatures.FormFactor.CLAMSHELL,
diff --git a/util/partner.star b/util/partner.star
index 95b66ee..10cdde6 100644
--- a/util/partner.star
+++ b/util/partner.star
@@ -1,8 +1,8 @@
-load("//config/proto/proto.star", "protos")
+load("//config/util/bindings/proto.star", "protos")
protos.register()
-load("@proto//src/config/api/partner.proto", partner_pb = "chromiumos.config.api")
-load("@proto//src/config/api/partner_id.proto", partner_id_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/partner.proto", partner_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/partner_id.proto", partner_id_pb = "chromiumos.config.api")
def _create(name):
partner_id = partner_id_pb.PartnerId(value = name)
@@ -14,4 +14,4 @@
partner = struct(
create = _create,
create_list = _create_list,
-)
\ No newline at end of file
+)
diff --git a/util/program.star b/util/program.star
index 6d714d2..272e7c4 100644
--- a/util/program.star
+++ b/util/program.star
@@ -1,8 +1,8 @@
-load("//config/proto/proto.star", "protos")
+load("//config/util/bindings/proto.star", "protos")
protos.register()
-load("@proto//src/config/api/program.proto", program_pb = "chromiumos.config.api")
-load("@proto//src/config/api/program_id.proto", program_id_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/program.proto", program_pb = "chromiumos.config.api")
+load("@proto//src/config/proto/api/program_id.proto", program_id_pb = "chromiumos.config.api")
def _create(name, component_quals = None, constraints = None):
@@ -18,4 +18,4 @@
program = struct(
create = _create,
create_list = _create_list,
-)
\ No newline at end of file
+)
