imports: Simplify pkg-config bootstrap definitions

5 files changed, 9 insertions, 25 deletions

diff --git a/etc/import.pkgconfig/TARGETS.bazel_remote_apis b/etc/import.pkgconfig/TARGETS.bazel_remote_apis
index 9c16e433..3a51bd53 100644
--- a/etc/import.pkgconfig/TARGETS.bazel_remote_apis
+++ b/etc/import.pkgconfig/TARGETS.bazel_remote_apis
@@ -1,13 +1,13 @@
 { "semver_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["semver_proto"]
-  , "srcs": [["include", "semver_proto_file"]]
+  , "srcs": ["build/bazel/semver/semver.proto"]
   }
 , "remote_execution_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["remote_execution_proto"]
   , "service": ["yes"]
-  , "srcs": [["include", "remote_execution_proto_file"]]
+  , "srcs": ["build/bazel/remote/execution/v2/remote_execution.proto"]
   , "deps":
     [ "semver_proto"
     , ["@", "google_apis", "", "google_api_annotations_proto"]
diff --git a/etc/import.pkgconfig/TARGETS.google_apis b/etc/import.pkgconfig/TARGETS.google_apis
index 1e579e50..73264879 100644
--- a/etc/import.pkgconfig/TARGETS.google_apis
+++ b/etc/import.pkgconfig/TARGETS.google_apis
@@ -1,30 +1,30 @@
 { "google_api_http_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_api_http_proto"]
-  , "srcs": [["include", "google_api_http_proto_file"]]
+  , "srcs": ["google/api/http.proto"]
   }
 , "google_api_annotations_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_api_annotations_proto"]
-  , "srcs": [["include", "google_api_annotations_proto_file"]]
+  , "srcs": ["google/api/annotations.proto"]
   , "deps": ["google_api_http_proto"]
   }
 , "google_bytestream_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_bytestream_proto"]
+  , "srcs": ["google/bytestream/bytestream.proto"]
   , "service": ["yes"]
-  , "srcs": [["include", "google_bytestream_proto_file"]]
   , "deps": ["google_api_annotations_proto"]
   }
 , "google_rpc_status_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_rpc_status_proto"]
-  , "srcs": [["include", "google_rpc_status_proto_file"]]
+  , "srcs": ["google/rpc/status.proto"]
   }
 , "google_longrunning_operations_proto":
   { "type": ["@", "rules", "proto", "library"]
   , "name": ["google_longrunning_operations_proto"]
-  , "srcs": [["include", "google_longrunning_operations_proto_file"]]
+  , "srcs": ["google/longrunning/operations.proto"]
   , "service": ["yes"]
   , "deps":
     [ "google_api_annotations_proto"
diff --git a/etc/import.pkgconfig/include/TARGETS.bazel_remote_apis b/etc/import.pkgconfig/include/TARGETS.bazel_remote_apis
deleted file mode 100644
index 6b4bcf21..00000000
--- a/etc/import.pkgconfig/include/TARGETS.bazel_remote_apis
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "semver_proto_file":
-  {"type": "install", "deps": ["build/bazel/semver/semver.proto"]}
-, "remote_execution_proto_file":
-  { "type": "install"
-  , "deps": ["build/bazel/remote/execution/v2/remote_execution.proto"]
-  }
-}
diff --git a/etc/import.pkgconfig/include/TARGETS.google_apis b/etc/import.pkgconfig/include/TARGETS.google_apis
deleted file mode 100644
index 5f7500ae..00000000
--- a/etc/import.pkgconfig/include/TARGETS.google_apis
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "google_api_http_proto_file":
-  {"type": "install", "deps": ["google/api/http.proto"]}
-, "google_api_annotations_proto_file":
-  {"type": "install", "deps": ["google/api/annotations.proto"]}
-, "google_bytestream_proto_file":
-  {"type": "install", "deps": ["google/bytestream/bytestream.proto"]}
-, "google_rpc_status_proto_file":
-  {"type": "install", "deps": ["google/rpc/status.proto"]}
-, "google_longrunning_operations_proto_file":
-  {"type": "install", "deps": ["google/longrunning/operations.proto"]}
-}
diff --git a/etc/repos.json b/etc/repos.json
index 4fb4a7de..6459654a 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -248,6 +248,7 @@
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.bazel_remote_apis"
     , "bindings": {"rules": "rules", "google_apis": "google_apis"}
+    , "pkg_bootstrap": {"local_path": "include"}
     }
   , "google_apis":
     { "repository":
@@ -261,6 +262,7 @@
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.google_apis"
     , "bindings": {"rules": "rules", "patches": "patches"}
+    , "pkg_bootstrap": {"local_path": "include"}
     }
   , "upb":
     { "repository":