summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2022-03-04 15:49:31 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2022-03-04 20:07:46 +0100
commit6f44f11a9a063d2f8f10a99c3531325e0fabead8 (patch)
treedcdeef9abb20dcd876af68561a318e975fe93c86
parentc89bfcbb2b991a57d0f829e49d91f0f7c00531b7 (diff)
downloadjustbuild-6f44f11a9a063d2f8f10a99c3531325e0fabead8.tar.gz
Patch away unused imports in bytestream.proto
-rw-r--r--etc/import/TARGETS.google_apis5
-rw-r--r--etc/patches/TARGETS1
-rw-r--r--etc/patches/bytestream.proto.diff13
-rw-r--r--etc/repos.json4
4 files changed, 22 insertions, 1 deletions
diff --git a/etc/import/TARGETS.google_apis b/etc/import/TARGETS.google_apis
index 28e6c1b6..e089b85b 100644
--- a/etc/import/TARGETS.google_apis
+++ b/etc/import/TARGETS.google_apis
@@ -9,6 +9,11 @@
, "srcs": ["google/api/annotations.proto"]
, "deps": ["google_api_http_proto"]
}
+, "google/bytestream/bytestream.proto":
+ { "type": ["@", "rules", "patch", "file"]
+ , "src": [["FILE", null, "google/bytestream/bytestream.proto"]]
+ , "patch": [["@", "patches", "", "bytestream.proto.diff"]]
+ }
, "google_bytestream_proto":
{ "type": ["@", "rules", "proto", "library"]
, "name": ["google_bytestream_proto"]
diff --git a/etc/patches/TARGETS b/etc/patches/TARGETS
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/etc/patches/TARGETS
@@ -0,0 +1 @@
+{}
diff --git a/etc/patches/bytestream.proto.diff b/etc/patches/bytestream.proto.diff
new file mode 100644
index 00000000..0ded6d5b
--- /dev/null
+++ b/etc/patches/bytestream.proto.diff
@@ -0,0 +1,13 @@
+--- bytestream.proto.orig 2022-03-04 15:34:51.771366591 +0100
++++ bytestream.proto 2022-03-04 15:36:46.721674292 +0100
+@@ -16,8 +16,8 @@
+
+ package google.bytestream;
+
+-import "google/api/annotations.proto";
+-import "google/protobuf/wrappers.proto";
++// import "google/api/annotations.proto";
++// import "google/protobuf/wrappers.proto";
+
+ option go_package = "google.golang.org/genproto/googleapis/bytestream;bytestream";
+ option java_outer_classname = "ByteStreamProto";
diff --git a/etc/repos.json b/etc/repos.json
index 83154e43..109d2a2b 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -17,6 +17,7 @@
, "bootstrap": {"link": ["-lgit2", "-lpthread"]}
}
, "defaults": {"repository": {"type": "file", "path": "etc/defaults"}}
+ , "patches": {"repository": {"type": "file", "path": "etc/patches"}}
, "rules":
{ "repository": {"type": "file", "path": "rules"}
, "target_root": "defaults"
@@ -163,7 +164,8 @@
}
, "target_root": "import targets"
, "target_file_name": "TARGETS.google_apis"
- , "bindings": {"rules": "rules-protobuf", "protoc": "protobuf"}
+ , "bindings":
+ {"rules": "rules-protobuf", "protoc": "protobuf", "patches": "patches"}
}
, "upb":
{ "repository":