diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 0ccef64757ea65..27d3e9240a885c 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -3,6 +3,7 @@ "registryFileHashes": { "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497", "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2", + "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589", "https://bcr.bazel.build/modules/abseil-cpp/20220623.1/MODULE.bazel": "73ae41b6818d423a11fd79d95aedef1258f304448193d4db4ff90e5e7a0f076c", "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/MODULE.bazel": "89047429cb0207707b2dface14ba7f8df85273d484c2572755be4bab7ce9c3a0", "https://bcr.bazel.build/modules/abseil-cpp/20230802.0.bcr.1/MODULE.bazel": "1c8cec495288dccd14fdae6e3f95f772c1c91857047a098fad772034264cc8cb", @@ -11,6 +12,8 @@ "https://bcr.bazel.build/modules/abseil-cpp/20240116.0/MODULE.bazel": "98dc378d64c12a4e4741ad3362f87fb737ee6a0886b2d90c3cdbb4d93ea3e0bf", "https://bcr.bazel.build/modules/abseil-cpp/20240116.1/MODULE.bazel": "37bcdb4440fbb61df6a1c296ae01b327f19e9bb521f9b8e26ec854b6f97309ed", "https://bcr.bazel.build/modules/abseil-cpp/20240116.2/MODULE.bazel": "73939767a4686cd9a520d16af5ab440071ed75cec1a876bf2fcfaf1f71987a16", + "https://bcr.bazel.build/modules/abseil-cpp/20240722.0.bcr.2/MODULE.bazel": "c3661b44c9d3f17f0b65ffb544896aaeb89127398ea867537babac18133a002a", + "https://bcr.bazel.build/modules/abseil-cpp/20240722.0.bcr.2/source.json": "464f3012c8f40cd51facbfc6962563971c6bd55f45ba16bd98313f2de73340c5", "https://bcr.bazel.build/modules/abseil-cpp/20240722.0/MODULE.bazel": "88668a07647adbdc14cb3a7cd116fb23c9dda37a90a1681590b6c9d8339a5b84", "https://bcr.bazel.build/modules/abseil-cpp/20250127.0/MODULE.bazel": "d1086e248cda6576862b4b3fe9ad76a214e08c189af5b42557a6e1888812c5d5", "https://bcr.bazel.build/modules/abseil-cpp/20250127.1/MODULE.bazel": "c4a89e7ceb9bf1e25cf84a9f830ff6b817b72874088bf5141b314726e46a57c1", @@ -19,6 +22,7 @@ "https://bcr.bazel.build/modules/apple_support/1.15.1/MODULE.bazel": "a0556fefca0b1bb2de8567b8827518f94db6a6e7e7d632b4c48dc5f865bc7c85", "https://bcr.bazel.build/modules/apple_support/1.17.1/MODULE.bazel": "655c922ab1209978a94ef6ca7d9d43e940cd97d9c172fb55f94d91ac53f8610b", "https://bcr.bazel.build/modules/apple_support/1.21.1/MODULE.bazel": "5809fa3efab15d1f3c3c635af6974044bac8a4919c62238cce06acee8a8c11f1", + "https://bcr.bazel.build/modules/apple_support/1.21.1/source.json": "c5228fea88af2d0aa4ef17355c5d3884ce78717f475c3eba55b55bca23a4a560", "https://bcr.bazel.build/modules/apple_support/1.22.1/MODULE.bazel": "90bd1a660590f3ceffbdf524e37483094b29352d85317060b2327fff8f3f4458", "https://bcr.bazel.build/modules/apple_support/1.22.1/source.json": "2bc34da8d0ebc4c4132c8b26db766ca1b86bbcf26dea94b94aa1cd73e2623aeb", "https://bcr.bazel.build/modules/apple_support/1.8.1/MODULE.bazel": "500f7aa32c008222e360dc9a158c248c2dbaeb3b6246c19e7269981dbd61e29b", @@ -50,12 +54,14 @@ "https://bcr.bazel.build/modules/bazel_skylib/1.4.2/MODULE.bazel": "3bd40978e7a1fac911d5989e6b09d8f64921865a45822d8b09e815eaa726a651", "https://bcr.bazel.build/modules/bazel_skylib/1.5.0/MODULE.bazel": "32880f5e2945ce6a03d1fbd588e9198c0a959bb42297b2cfaf1685b7bc32e138", "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917", + "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d", "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b", "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/source.json": "f121b43eeefc7c29efbd51b83d08631e2347297c95aac9764a701f2a6a2bb953", "https://bcr.bazel.build/modules/blake3/1.5.1.bcr.1/MODULE.bazel": "6f22a783790d834c8e2c91ab85848e781e65078a96304e99e4595763622b171a", "https://bcr.bazel.build/modules/blake3/1.5.1.bcr.1/source.json": "0e27e27f359ae8fdc140f8ae0891bb719664c3d6a0ab1e7cdb9b8ae372c72f17", "https://bcr.bazel.build/modules/boringssl/0.0.0-20211025-d4f1ab9/MODULE.bazel": "6ee6353f8b1a701fe2178e1d925034294971350b6d3ac37e67e5a7d463267834", "https://bcr.bazel.build/modules/boringssl/0.0.0-20230215-5c22014/MODULE.bazel": "4b03dc0d04375fa0271174badcd202ed249870c8e895b26664fd7298abea7282", + "https://bcr.bazel.build/modules/boringssl/0.0.0-20230215-5c22014/source.json": "f90873cd3d891bb63ece55a527d97366da650f84c79c2109bea29c17629bee20", "https://bcr.bazel.build/modules/boringssl/0.0.0-20240530-2db0eb3/MODULE.bazel": "d0405b762c5e87cd445b7015f2b8da5400ef9a8dbca0bfefa6c1cea79d528a97", "https://bcr.bazel.build/modules/boringssl/0.20240913.0/MODULE.bazel": "fcaa7503a5213290831a91ed1eb538551cf11ac0bc3a6ad92d0fef92c5bd25fb", "https://bcr.bazel.build/modules/boringssl/0.20241024.0/MODULE.bazel": "b540cff73d948cb79cb0bc108d7cef391d2098a25adabfda5043e4ef548dbc87", @@ -64,6 +70,7 @@ "https://bcr.bazel.build/modules/buildozer/8.2.0.bcr.1/MODULE.bazel": "416ecb0388d1f2e50087c1634a574541a15a0045b3fdb67f9086a81fc01e6cce", "https://bcr.bazel.build/modules/buildozer/8.2.0.bcr.1/source.json": "2522f464227f519d10abe4a1f9c267e1c47641fdb23dac30cae6a95d6d7cf055", "https://bcr.bazel.build/modules/c-ares/1.15.0/MODULE.bazel": "ba0a78360fdc83f02f437a9e7df0532ad1fbaa59b722f6e715c11effebaa0166", + "https://bcr.bazel.build/modules/c-ares/1.15.0/source.json": "5e3ed991616c5ec4cc09b0893b29a19232de4a1830eb78c567121bfea87453f7", "https://bcr.bazel.build/modules/c-ares/1.19.1/MODULE.bazel": "73bca21720772370ff91cc8e88bbbaf14897720c6473e87c1ddc0f848284c313", "https://bcr.bazel.build/modules/c-ares/1.19.1/source.json": "56bfa95b01e4e0012e90eaa9f1bab823c48c3af4454286b889b9cc74f5098da1", "https://bcr.bazel.build/modules/cel-spec/0.15.0/MODULE.bazel": "e1eed53d233acbdcf024b4b0bc1528116d92c29713251b5154078ab1348cb600", @@ -73,6 +80,7 @@ "https://bcr.bazel.build/modules/civetweb/1.16/MODULE.bazel": "46a38f9daeb57392e3827fce7d40926be0c802bd23cdd6bfd3a96c804de42fae", "https://bcr.bazel.build/modules/civetweb/1.16/source.json": "ba8b9585adb8355cb51b999d57172fd05e7a762c56b8d4bac6db42c99de3beb7", "https://bcr.bazel.build/modules/curl/8.4.0/MODULE.bazel": "0bc250aa1cb69590049383df7a9537c809591fcf876c620f5f097c58fdc9bc10", + "https://bcr.bazel.build/modules/curl/8.4.0/source.json": "8b9532397af6a24be4ec118d8637b1f4e3e5a0d4be672c94b2275d675c7f7d6b", "https://bcr.bazel.build/modules/curl/8.7.1/MODULE.bazel": "088221c35a2939c555e6e47cb31a81c15f8b59f4daa8009b1e9271a502d33485", "https://bcr.bazel.build/modules/curl/8.8.0/MODULE.bazel": "7da3b3e79b0b4ee8f8c95d640bc6ad7b430ce66ef6e9c9d2bc29b3b5ef85f6fe", "https://bcr.bazel.build/modules/curl/8.8.0/source.json": "d7d138b6878cf38891692fee0649ace35357fd549b425614d571786f054374d4", @@ -87,10 +95,12 @@ "https://bcr.bazel.build/modules/gazelle/0.33.0/MODULE.bazel": "a13a0f279b462b784fb8dd52a4074526c4a2afe70e114c7d09066097a46b3350", "https://bcr.bazel.build/modules/gazelle/0.34.0/MODULE.bazel": "abdd8ce4d70978933209db92e436deb3a8b737859e9354fb5fd11fb5c2004c8a", "https://bcr.bazel.build/modules/gazelle/0.36.0/MODULE.bazel": "e375d5d6e9a6ca59b0cb38b0540bc9a05b6aa926d322f2de268ad267a2ee74c0", + "https://bcr.bazel.build/modules/gazelle/0.36.0/source.json": "0823f097b127e0201ae55d85647c94095edfe27db0431a7ae880dcab08dfaa04", "https://bcr.bazel.build/modules/gazelle/0.37.0/MODULE.bazel": "d1327ba0907d0275ed5103bfbbb13518f6c04955b402213319d0d6c0ce9839d4", "https://bcr.bazel.build/modules/gazelle/0.37.0/source.json": "b3adc10e2394e7f63ea88fb1d622d4894bfe9ec6961c493ae9a887723ab16831", "https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb", "https://bcr.bazel.build/modules/google_benchmark/1.8.4/MODULE.bazel": "c6d54a11dcf64ee63545f42561eda3fd94c1b5f5ebe1357011de63ae33739d5e", + "https://bcr.bazel.build/modules/google_benchmark/1.8.4/source.json": "84590f7bc5a1fd99e1ef274ee16bb41c214f705e62847b42e705010dfa81fe53", "https://bcr.bazel.build/modules/google_benchmark/1.8.5/MODULE.bazel": "9ba9b31b984022828a950e3300410977eda2e35df35584c6b0b2d0c2e52766b7", "https://bcr.bazel.build/modules/google_benchmark/1.9.4/MODULE.bazel": "3bab7c17c10580f87b647478a72a05621f88abc275afb97b578c828f56e59d45", "https://bcr.bazel.build/modules/google_benchmark/1.9.4/source.json": "8e0036f76a5c2aa9c16ca0da57d8065cff69edeed58f1f85584c588c0ef723a5", @@ -102,15 +112,19 @@ "https://bcr.bazel.build/modules/googleapis-rules-registry/1.0.0/source.json": "cf611c836a60e98e2e2ab2de8004f119e9f06878dcf4ea2d95a437b1b7a89fe9", "https://bcr.bazel.build/modules/googleapis/0.0.0-20240326-1c8d509c5/MODULE.bazel": "a4b7e46393c1cdcc5a00e6f85524467c48c565256b22b5fae20f84ab4a999a68", "https://bcr.bazel.build/modules/googleapis/0.0.0-20240819-fe8ba054a/MODULE.bazel": "117b7c7be7327ed5d6c482274533f2dbd78631313f607094d4625c28203cacdf", + "https://bcr.bazel.build/modules/googleapis/0.0.0-20240819-fe8ba054a/source.json": "b31fc7eb283a83f71d2e5bfc3d1c562d2994198fa1278409fbe8caec3afc1d3e", "https://bcr.bazel.build/modules/googleapis/0.0.0-20250604-de157ca3/MODULE.bazel": "de6044bf0edf78f1f51b800a0633dc7dd305aaf6ee878116757f98cd1a05477d", "https://bcr.bazel.build/modules/googleapis/0.0.0-20250604-de157ca3/source.json": "44b8b8174f416116daaa9345857b87b87351baf8b19e8f838a32f1ce08345be6", + "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4", "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6", "https://bcr.bazel.build/modules/googletest/1.14.0/MODULE.bazel": "cfbcbf3e6eac06ef9d85900f64424708cc08687d1b527f0ef65aa7517af8118f", "https://bcr.bazel.build/modules/googletest/1.15.2/MODULE.bazel": "6de1edc1d26cafb0ea1a6ab3f4d4192d91a312fd2d360b63adaa213cd00b2108", + "https://bcr.bazel.build/modules/googletest/1.15.2/source.json": "dbdda654dcb3a0d7a8bc5d0ac5fc7e150b58c2a986025ae5bc634bb2cb61f470", "https://bcr.bazel.build/modules/googletest/1.16.0/MODULE.bazel": "a175623c69e94fca4ca7acbc12031e637b0c489318cd4805606981d4d7adb34a", "https://bcr.bazel.build/modules/googletest/1.16.0/source.json": "dd011b202542efcd4c0e3df34b1558d41598c6f287846728315ded5f7984b77a", "https://bcr.bazel.build/modules/grpc-java/1.62.2/MODULE.bazel": "99b8771e8c7cacb130170fed2a10c9e8fed26334a93e73b42d2953250885a158", "https://bcr.bazel.build/modules/grpc-java/1.66.0/MODULE.bazel": "86ff26209fac846adb89db11f3714b3dc0090fb2fb81575673cc74880cda4e7e", + "https://bcr.bazel.build/modules/grpc-java/1.66.0/source.json": "f841b339ff8516c86c3a5272cd053194dd0cb2fdd63157123835e1157a28328d", "https://bcr.bazel.build/modules/grpc-java/1.69.0/MODULE.bazel": "53887af6a00b3b406d70175d3d07e84ea9362016ff55ea90b9185f0227bfaf98", "https://bcr.bazel.build/modules/grpc-java/1.71.0/MODULE.bazel": "a0ca84909a119ce24f5966978fdb4ab857bcddb5866b34af2e693fc6648db228", "https://bcr.bazel.build/modules/grpc-java/1.71.0/source.json": "aa8c2bf0f67e499c450a2a14a05a588eb852ffb82b9a6864274655271995795f", @@ -121,6 +135,7 @@ "https://bcr.bazel.build/modules/grpc/1.62.1/MODULE.bazel": "2998211594b8a79a6b459c4e797cfa19f0fb8b3be3149760ec7b8c99abfd426f", "https://bcr.bazel.build/modules/grpc/1.63.1.bcr.1/MODULE.bazel": "d7b9fef03bd175e6825237b521b18a3c29f1ac15f8aa52c8a1a0f3bd8f33d54b", "https://bcr.bazel.build/modules/grpc/1.66.0.bcr.2/MODULE.bazel": "0fa2b0fd028ce354febf0fe90f1ed8fecfbfc33118cddd95ac0418cc283333a0", + "https://bcr.bazel.build/modules/grpc/1.66.0.bcr.2/source.json": "d2b273a925507d47b5e2d6852f194e70d2991627d71b13793cc2498400d4f99e", "https://bcr.bazel.build/modules/grpc/1.66.0.bcr.3/MODULE.bazel": "f6047e89faf488f5e3e65cb2594c6f5e86992abec7487163ff6b623526e543b0", "https://bcr.bazel.build/modules/grpc/1.69.0/MODULE.bazel": "4e26e05c9e1ef291ccbc96aad8e457b1b8abedbc141623831629da2f8168eef6", "https://bcr.bazel.build/modules/grpc/1.73.1/MODULE.bazel": "69737e1dab5c36fd12daf0a0f9d3adaaf983c8422052a58a3a652454435975b4", @@ -129,11 +144,14 @@ "https://bcr.bazel.build/modules/javacc/7.0.13/source.json": "34cfc2dfae2eca5a9eb3c56fb4677859a7c872c2d0b0a88c2bf833ab76150893", "https://bcr.bazel.build/modules/javaparser/3.26.2/MODULE.bazel": "32ff49d7aa587ebe837b14931c2b3bc24b2aaaec308de82ebf0e52f9fdf8966f", "https://bcr.bazel.build/modules/javaparser/3.26.2/source.json": "0e11a098026966aaef482f410b0b671680f3814180552505266c78e5af0e4a90", + "https://bcr.bazel.build/modules/jsoncpp/1.9.5/MODULE.bazel": "31271aedc59e815656f5736f282bb7509a97c7ecb43e927ac1a37966e0578075", + "https://bcr.bazel.build/modules/jsoncpp/1.9.5/source.json": "4108ee5085dd2885a341c7fab149429db457b3169b86eb081fa245eadf69169d", "https://bcr.bazel.build/modules/jsoncpp/1.9.6/MODULE.bazel": "2f8d20d3b7d54143213c4dfc3d98225c42de7d666011528dc8fe91591e2e17b0", "https://bcr.bazel.build/modules/jsoncpp/1.9.6/source.json": "a04756d367a2126c3541682864ecec52f92cdee80a35735a3cb249ce015ca000", "https://bcr.bazel.build/modules/libpfm/4.11.0.bcr.1/MODULE.bazel": "e5362dadc90aab6724c83a2cc1e67cbed9c89a05d97fb1f90053c8deb1e445c8", "https://bcr.bazel.build/modules/libpfm/4.11.0.bcr.1/source.json": "0646414d9037f8aad148781dd760bec90b0b25ac12fda5e03f8aadbd6b9c61e6", "https://bcr.bazel.build/modules/libpfm/4.11.0/MODULE.bazel": "45061ff025b301940f1e30d2c16bea596c25b176c8b6b3087e92615adbd52902", + "https://bcr.bazel.build/modules/libpfm/4.11.0/source.json": "caaffb3ac2b59b8aac456917a4ecf3167d40478ee79f15ab7a877ec9273937c9", "https://bcr.bazel.build/modules/mbedtls/3.6.0/MODULE.bazel": "8e380e4698107c5f8766264d4df92e36766248447858db28187151d884995a09", "https://bcr.bazel.build/modules/mbedtls/3.6.0/source.json": "1dbe7eb5258050afcc3806b9d43050f71c6f539ce0175535c670df606790b30c", "https://bcr.bazel.build/modules/nlohmann_json/3.11.3/MODULE.bazel": "87023db2f55fc3a9949c7b08dc711fae4d4be339a80a99d04453c4bb3998eefc", @@ -146,10 +164,12 @@ "https://bcr.bazel.build/modules/openssl/3.3.1.bcr.1/MODULE.bazel": "49c0c07e8fb87b480bccb842cfee1b32617f11dac590f732573c69058699a3d1", "https://bcr.bazel.build/modules/openssl/3.3.1.bcr.1/source.json": "0c0872e048bbea052a9c541fb47019481a19201ba5555a71d762ad591bf94e1f", "https://bcr.bazel.build/modules/opentelemetry-cpp/1.14.2/MODULE.bazel": "089a5613c2a159c7dfde098dabfc61e966889c7d6a81a98422a84c51535ed17d", + "https://bcr.bazel.build/modules/opentelemetry-cpp/1.14.2/source.json": "0c5f85ab9e5894c6f1382cf58ba03a6cd024f0592bee2229f99db216ef0c6764", "https://bcr.bazel.build/modules/opentelemetry-cpp/1.16.0/MODULE.bazel": "b7379a140f538cea3f749179a2d481ed81942cc6f7b05a6113723eb34ac3b3e7", "https://bcr.bazel.build/modules/opentelemetry-cpp/1.19.0/MODULE.bazel": "3455326c08b28415648a3d60d8e3c811847ebdbe64474f75b25878f25585aea1", "https://bcr.bazel.build/modules/opentelemetry-cpp/1.19.0/source.json": "4e48137e4c3ecb99401ff99876df8fa330598d7da051869bec643446e8a8ff95", "https://bcr.bazel.build/modules/opentelemetry-proto/1.1.0/MODULE.bazel": "a49f406e99bf05ab43ed4f5b3322fbd33adfd484b6546948929d1316299b68bf", + "https://bcr.bazel.build/modules/opentelemetry-proto/1.1.0/source.json": "39ffadc4b7d9ccc0c0f45422510cbaeb8eca7b26e68d4142fc3ff18b4c2711b6", "https://bcr.bazel.build/modules/opentelemetry-proto/1.3.1/MODULE.bazel": "0141a50e989576ee064c11ce8dd5ec89993525bd9f9a09c5618e4dacc8df9352", "https://bcr.bazel.build/modules/opentelemetry-proto/1.4.0.bcr.1/MODULE.bazel": "5ceaf25e11170d22eded4c8032728b4a3f273765fccda32f9e94f463755c4167", "https://bcr.bazel.build/modules/opentelemetry-proto/1.5.0/MODULE.bazel": "7543d91a53b98e7b5b37c5a0865b93bff12c1ee022b1e322cd236b968894b030", @@ -167,8 +187,21 @@ "https://bcr.bazel.build/modules/platforms/1.0.0/MODULE.bazel": "f05feb42b48f1b3c225e4ccf351f367be0371411a803198ec34a389fb22aa580", "https://bcr.bazel.build/modules/platforms/1.0.0/source.json": "f4ff1fd412e0246fd38c82328eb209130ead81d62dcd5a9e40910f867f733d96", "https://bcr.bazel.build/modules/prometheus-cpp/1.2.4/MODULE.bazel": "0fbe5dcff66311947a3f6b86ebc6a6d9328e31a28413ca864debc4a043f371e5", + "https://bcr.bazel.build/modules/prometheus-cpp/1.2.4/source.json": "aa58bb10d0bb0dcaf4ad2c509ddcec23d2e94c3935e21517a5adbc2363248a55", "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0/MODULE.bazel": "ce82e086bbc0b60267e970f6a54b2ca6d0f22d3eb6633e00e2cc2899c700f3d8", "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0/source.json": "8cb66b4e535afc718e9d104a3db96ccb71a42ee816a100e50fd0d5ac843c0606", + "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7", + "https://bcr.bazel.build/modules/protobuf/23.1/MODULE.bazel": "88b393b3eb4101d18129e5db51847cd40a5517a53e81216144a8c32dfeeca52a", + "https://bcr.bazel.build/modules/protobuf/26.0.bcr.2/MODULE.bazel": "62e0b84ca727bdeb55a6fe1ef180e6b191bbe548a58305ea1426c158067be534", + "https://bcr.bazel.build/modules/protobuf/27.0/MODULE.bazel": "7873b60be88844a0a1d8f80b9d5d20cfbd8495a689b8763e76c6372998d3f64c", + "https://bcr.bazel.build/modules/protobuf/27.1/MODULE.bazel": "703a7b614728bb06647f965264967a8ef1c39e09e8f167b3ca0bb1fd80449c0d", + "https://bcr.bazel.build/modules/protobuf/29.0-rc2/MODULE.bazel": "6241d35983510143049943fc0d57937937122baf1b287862f9dc8590fc4c37df", + "https://bcr.bazel.build/modules/protobuf/29.0-rc3/MODULE.bazel": "33c2dfa286578573afc55a7acaea3cada4122b9631007c594bf0729f41c8de92", + "https://bcr.bazel.build/modules/protobuf/29.0/MODULE.bazel": "319dc8bf4c679ff87e71b1ccfb5a6e90a6dbc4693501d471f48662ac46d04e4e", + "https://bcr.bazel.build/modules/protobuf/29.0/source.json": "b857f93c796750eef95f0d61ee378f3420d00ee1dd38627b27193aa482f4f981", + "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0", + "https://bcr.bazel.build/modules/protobuf/3.19.2/MODULE.bazel": "532ffe5f2186b69fdde039efe6df13ba726ff338c6bc82275ad433013fa10573", + "https://bcr.bazel.build/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858", "https://bcr.bazel.build/modules/protobuf/31.1/MODULE.bazel": "379a389bb330b7b8c1cdf331cc90bf3e13de5614799b3b52cdb7c6f389f6b38e", "https://bcr.bazel.build/modules/protobuf/31.1/source.json": "25af5d0219da0c0fc4d1191a24ce438e6ca7f49d2e1a94f354efeba6ef10426f", "https://bcr.bazel.build/modules/protoc-gen-validate/1.0.4.bcr.2/MODULE.bazel": "c4bd2c850211ff5b7dadf9d2d0496c1c922fdedc303c775b01dfd3b3efc907ed", @@ -189,6 +222,8 @@ "https://bcr.bazel.build/modules/rules_android/0.1.1/MODULE.bazel": "48809ab0091b07ad0182defb787c4c5328bd3a278938415c00a7b69b50c4d3a8", "https://bcr.bazel.build/modules/rules_android/0.1.1/source.json": "e6986b41626ee10bdc864937ffb6d6bf275bb5b9c65120e6137d56e6331f089e", "https://bcr.bazel.build/modules/rules_apple/3.16.0/MODULE.bazel": "0d1caf0b8375942ce98ea944be754a18874041e4e0459401d925577624d3a54a", + "https://bcr.bazel.build/modules/rules_apple/3.21.0/MODULE.bazel": "b97f75d89b83c3f1546659d0f598cf5b88458237867e5ddaee445e9de7b81bdb", + "https://bcr.bazel.build/modules/rules_apple/3.21.0/source.json": "e87a972938297f3fbe0636cd70b1ef5993557907cd7cc78f7d2369f3ea9f4fb7", "https://bcr.bazel.build/modules/rules_apple/3.5.1/MODULE.bazel": "3d1bbf65ad3692003d36d8a29eff54d4e5c1c5f4bfb60f79e28646a924d9101c", "https://bcr.bazel.build/modules/rules_apple/4.0.1/MODULE.bazel": "dec3ca18ca4680c66a33341918ef5160ba37b51b282435e2ec01490b2f873475", "https://bcr.bazel.build/modules/rules_apple/4.0.1/source.json": "8dab1eed33e306e60bd4a066e7ac14f660e0c389659fc80ab300dbfcb3182ad6", @@ -205,9 +240,12 @@ "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5", "https://bcr.bazel.build/modules/rules_cc/0.1.1/MODULE.bazel": "2f0222a6f229f0bf44cd711dc13c858dad98c62d52bd51d8fc3a764a83125513", + "https://bcr.bazel.build/modules/rules_cc/0.1.1/source.json": "d61627377bd7dd1da4652063e368d9366fc9a73920bfa396798ad92172cf645c", "https://bcr.bazel.build/modules/rules_cc/0.1.2/MODULE.bazel": "557ddc3a96858ec0d465a87c0a931054d7dcfd6583af2c7ed3baf494407fd8d0", "https://bcr.bazel.build/modules/rules_cc/0.1.2/source.json": "53fcb09b5816c83ca60d9d7493faf3bfaf410dfc2f15deb52d6ddd146b8d43f0", "https://bcr.bazel.build/modules/rules_foreign_cc/0.10.1/MODULE.bazel": "b9527010e5fef060af92b6724edb3691970a5b1f76f74b21d39f7d433641be60", + "https://bcr.bazel.build/modules/rules_foreign_cc/0.15.0/MODULE.bazel": "fddf47051761cdbbe950bdcf3047e68540f48a63c8329e6ed0605d6007fd9334", + "https://bcr.bazel.build/modules/rules_foreign_cc/0.15.0/source.json": "563eee5c2d0195d71caf2f5869e3ce20dd690aa96ffb9d9da255a4f9eb0339bd", "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6", "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8", "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/source.json": "c8b1e2c717646f1702290959a3302a178fb639d987ab61d548105019f11e527e", @@ -219,6 +257,7 @@ "https://bcr.bazel.build/modules/rules_go/0.45.1/MODULE.bazel": "6d7884f0edf890024eba8ab31a621faa98714df0ec9d512389519f0edff0281a", "https://bcr.bazel.build/modules/rules_go/0.46.0/MODULE.bazel": "3477df8bdcc49e698b9d25f734c4f3a9f5931ff34ee48a2c662be168f5f2d3fd", "https://bcr.bazel.build/modules/rules_go/0.48.0/MODULE.bazel": "d00ebcae0908ee3f5e6d53f68677a303d6d59a77beef879598700049c3980a03", + "https://bcr.bazel.build/modules/rules_go/0.48.0/source.json": "895dc1698fd7c5959f92868f3a87156ad1ed8d876668bfa918fa0a623fb1eb22", "https://bcr.bazel.build/modules/rules_go/0.50.1/MODULE.bazel": "b91a308dc5782bb0a8021ad4330c81fea5bda77f96b9e4c117b9b9c8f6665ee0", "https://bcr.bazel.build/modules/rules_go/0.50.1/source.json": "205765fd30216c70321f84c9a967267684bdc74350af3f3c46c857d9f80a4fa2", "https://bcr.bazel.build/modules/rules_graalvm/0.11.1/MODULE.bazel": "0caaea2dff60b70b8f9b9ceb6e5ae815b85ae610a0392433a22c755b2f2c2456", @@ -235,9 +274,12 @@ "https://bcr.bazel.build/modules/rules_java/7.2.0/MODULE.bazel": "06c0334c9be61e6cef2c8c84a7800cef502063269a5af25ceb100b192453d4ab", "https://bcr.bazel.build/modules/rules_java/7.4.0/MODULE.bazel": "a592852f8a3dd539e82ee6542013bf2cadfc4c6946be8941e189d224500a8934", "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", + "https://bcr.bazel.build/modules/rules_java/8.11.0/MODULE.bazel": "c3d280bc5ff1038dcb3bacb95d3f6b83da8dd27bba57820ec89ea4085da767ad", "https://bcr.bazel.build/modules/rules_java/8.12.0/MODULE.bazel": "8e6590b961f2defdfc2811c089c75716cb2f06c8a4edeb9a8d85eaa64ee2a761", + "https://bcr.bazel.build/modules/rules_java/8.12.0/source.json": "cbd5d55d9d38d4008a7d00bee5b5a5a4b6031fcd4a56515c9accbcd42c7be2ba", "https://bcr.bazel.build/modules/rules_java/8.13.0/MODULE.bazel": "0444ebf737d144cf2bb2ccb368e7f1cce735264285f2a3711785827c1686625e", "https://bcr.bazel.build/modules/rules_java/8.13.0/source.json": "4605c0f676b87dd9d1fabd4d743b71f04d97503bd1a79aad53f87399fb5396de", + "https://bcr.bazel.build/modules/rules_java/8.3.2/MODULE.bazel": "7336d5511ad5af0b8615fdc7477535a2e4e723a357b6713af439fe8cf0195017", "https://bcr.bazel.build/modules/rules_java/8.5.1/MODULE.bazel": "d8a9e38cc5228881f7055a6079f6f7821a073df3744d441978e7a43e20226939", "https://bcr.bazel.build/modules/rules_java/8.6.1/MODULE.bazel": "f4808e2ab5b0197f094cabce9f4b006a27766beb6a9975931da07099560ca9c2", "https://bcr.bazel.build/modules/rules_jvm_external/6.5/MODULE.bazel": "54f3e81ae9b57ede5916c9a48add664dc30a5ce3855376b51ae7d6f23405daf8", @@ -261,6 +303,7 @@ "https://bcr.bazel.build/modules/rules_proto/6.0.2/MODULE.bazel": "ce916b775a62b90b61888052a416ccdda405212b6aaeb39522f7dc53431a5e73", "https://bcr.bazel.build/modules/rules_proto/7.0.2/MODULE.bazel": "bf81793bd6d2ad89a37a40693e56c61b0ee30f7a7fdbaf3eabbf5f39de47dea2", "https://bcr.bazel.build/modules/rules_proto/7.0.2/source.json": "1e5e7260ae32ef4f2b52fd1d0de8d03b606a44c91b694d2f1afb1d3b28a48ce1", + "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f", "https://bcr.bazel.build/modules/rules_python/0.20.0/MODULE.bazel": "bfe14d17f20e3fe900b9588f526f52c967a6f281e47a1d6b988679bd15082286", "https://bcr.bazel.build/modules/rules_python/0.22.0/MODULE.bazel": "b8057bafa11a9e0f4b08fc3b7cd7bee0dcbccea209ac6fc9a3ff051cd03e19e9", "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel": "26114f0c0b5e93018c0c066d6673f1a2c3737c7e90af95eff30cfee38d0bbac7", @@ -274,6 +317,7 @@ "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c", "https://bcr.bazel.build/modules/rules_python/0.40.0/MODULE.bazel": "9d1a3cd88ed7d8e39583d9ffe56ae8a244f67783ae89b60caafc9f5cf318ada7", "https://bcr.bazel.build/modules/rules_python/1.0.0/MODULE.bazel": "898a3d999c22caa585eb062b600f88654bf92efb204fa346fb55f6f8edffca43", + "https://bcr.bazel.build/modules/rules_python/1.2.0/MODULE.bazel": "5aeeb48b2a6c19d668b48adf2b8a2b209a6310c230db0ce77450f148a89846e4", "https://bcr.bazel.build/modules/rules_python/1.3.0/MODULE.bazel": "8361d57eafb67c09b75bf4bbe6be360e1b8f4f18118ab48037f2bd50aa2ccb13", "https://bcr.bazel.build/modules/rules_python/1.3.0/source.json": "25932f917cd279c7baefa6cb1d3fa8750a7a29de522024449b19af6eab51f4a0", "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c", @@ -295,8 +339,10 @@ "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/MODULE.bazel": "5e463fbfba7b1701d957555ed45097d7f984211330106ccd1352c6e0af0dcf91", "https://bcr.bazel.build/modules/swift_argument_parser/1.3.1.1/source.json": "32bd87e5f4d7acc57c5b2ff7c325ae3061d5e242c0c4c214ae87e0f1c13e54cb", "https://bcr.bazel.build/modules/upb/0.0.0-20211020-160625a/MODULE.bazel": "6cced416be2dc5b9c05efd5b997049ba795e5e4e6fafbe1624f4587767638928", + "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", "https://bcr.bazel.build/modules/upb/0.0.0-20230516-61a97ef/MODULE.bazel": "c0df5e35ad55e264160417fd0875932ee3c9dda63d9fccace35ac62f45e1b6f9", "https://bcr.bazel.build/modules/upb/0.0.0-20230907-e7430e6/MODULE.bazel": "3a7dedadf70346e678dc059dbe44d05cbf3ab17f1ce43a1c7a42edc7cbf93fd9", + "https://bcr.bazel.build/modules/upb/0.0.0-20230907-e7430e6/source.json": "6e513de1d26d1ded97a1c98a8ee166ff9be371a71556d4bc91220332dd3aa48e", "https://bcr.bazel.build/modules/wabt/1.0.37/MODULE.bazel": "c3907ead6f98348df098f380061c5c9d8f4ac9a60aefdcf83919e29c30777da0", "https://bcr.bazel.build/modules/wabt/1.0.37/source.json": "d86a91e1a6e4b548d2d80938144340d124defc35a3d59c1c2f02960debf97f32", "https://bcr.bazel.build/modules/with_cfg.bzl/0.6.0/MODULE.bazel": "174257966441fb8af45c939854ba38fd8364b7e48e3155c7c0ce5ef869af80aa", @@ -304,6 +350,7 @@ "https://bcr.bazel.build/modules/xds/0.0.0-20240423-555b57e/MODULE.bazel": "cea509976a77e34131411684ef05a1d6ad194dd71a8d5816643bc5b0af16dc0f", "https://bcr.bazel.build/modules/xds/0.0.0-20240423-555b57e/source.json": "7227e1fcad55f3f3cab1a08691ecd753cb29cc6380a47bc650851be9f9ad6d20", "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", + "https://bcr.bazel.build/modules/zlib/1.2.12/MODULE.bazel": "3b1a8834ada2a883674be8cbd36ede1b6ec481477ada359cd2d3ddc562340b27", "https://bcr.bazel.build/modules/zlib/1.2.13/MODULE.bazel": "aa6deb1b83c18ffecd940c4119aff9567cd0a671d7bba756741cb2ef043a29d5", "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.1/MODULE.bazel": "6a9fe6e3fc865715a7be9823ce694ceb01e364c35f7a846bf0d2b34762bc066b", "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79", @@ -691,6 +738,230 @@ "recordedRepoMappingEntries": [] } }, + "@@grpc+//bazel:grpc_deps.bzl%grpc_repo_deps_ext": { + "general": { + "bzlTransitiveDigest": "4FT8Nb9/8sEx0/6VoLh5ENpxKp7ryTiXHGTSEC1hBMc=", + "usagesDigest": "Z26QZp+BO+JA3lXVmiYgAksjiJCi6os73HzdVzGRaw8=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "io_opencensus_cpp": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "46b3b5812c150a21bacf860c2f76fc42b89773ed77ee954c32adeb8593aa2a8e", + "strip_prefix": "opencensus-cpp-5501a1a255805e0be83a41348bb5f2630d5ed6b3", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-cpp/archive/5501a1a255805e0be83a41348bb5f2630d5ed6b3.tar.gz", + "https://github.com/census-instrumentation/opencensus-cpp/archive/5501a1a255805e0be83a41348bb5f2630d5ed6b3.tar.gz" + ] + } + }, + "envoy_api": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "e525a6fb6e6ed3eef1eec6bef3da9b5708e471f0f9335a7604df14a4b386231e", + "strip_prefix": "data-plane-api-f8b75d1efa92bbf534596a013d9ca5873f79dd30", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/f8b75d1efa92bbf534596a013d9ca5873f79dd30.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/f8b75d1efa92bbf534596a013d9ca5873f79dd30.tar.gz" + ] + } + }, + "opencensus_proto": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "b7e13f0b4259e80c3070b583c2f39e53153085a6918718b1c710caf7037572b0", + "strip_prefix": "opencensus-proto-0.3.0/src", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz", + "https://github.com/census-instrumentation/opencensus-proto/archive/v0.3.0.tar.gz" + ] + } + }, + "com_envoyproxy_protoc_gen_validate": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "strip_prefix": "protoc-gen-validate-4694024279bdac52b77e22dc87808bd0fd732b69", + "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47", + "urls": [ + "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz" + ], + "patches": [ + "@@grpc+//third_party:protoc-gen-validate.patch" + ], + "patch_args": [ + "-p1" + ] + } + }, + "com_github_cncf_xds": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "dc305e20c9fa80822322271b50aa2ffa917bf4fd3973bcec52bfc28dc32c5927", + "strip_prefix": "xds-3a472e524827f72d1ad621c4983dd5af54c46776", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/cncf/xds/archive/3a472e524827f72d1ad621c4983dd5af54c46776.tar.gz", + "https://github.com/cncf/xds/archive/3a472e524827f72d1ad621c4983dd5af54c46776.tar.gz" + ] + } + }, + "google_cloud_cpp": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "7ca7f583b60d2aa1274411fed3b9fb3887119b2e84244bb3fc69ea1db819e4e5", + "strip_prefix": "google-cloud-cpp-2.16.0", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.16.0.tar.gz", + "https://github.com/googleapis/google-cloud-cpp/archive/refs/tags/v2.16.0.tar.gz" + ] + } + } + }, + "recordedRepoMappingEntries": [ + [ + "grpc+", + "bazel_tools", + "bazel_tools" + ], + [ + "grpc+", + "com_github_grpc_grpc", + "grpc+" + ] + ] + } + }, + "@@grpc+//bazel:grpc_python_deps.bzl%grpc_python_deps_ext": { + "general": { + "bzlTransitiveDigest": "KgKSwrHA6psVbhI0u793GWDVdK2hl9V8turs22buZyI=", + "usagesDigest": "Zad6SPAWRykRnPl+GJeOWhsC1n9cKC3afUQee4TVXxc=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "cython": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file": "@@grpc+//third_party:cython.BUILD", + "sha256": "a2da56cc22be823acf49741b9aa3aa116d4f07fa8e8b35a3cb08b8447b37c607", + "strip_prefix": "cython-0.29.35", + "urls": [ + "https://github.com/cython/cython/archive/0.29.35.tar.gz" + ] + } + } + }, + "recordedRepoMappingEntries": [ + [ + "grpc+", + "bazel_tools", + "bazel_tools" + ], + [ + "grpc+", + "com_github_grpc_grpc", + "grpc+" + ] + ] + } + }, + "@@grpc-java+//:repositories.bzl%grpc_java_repositories_extension": { + "general": { + "bzlTransitiveDigest": "kbYs28gryC+E1nmPkdVUFUTJzOfgdlyJizm0LS7ew5M=", + "usagesDigest": "Sa5QQaLepBN1KrxpoHFrKfnZPhhFIY8XIS4JoUpKC2s=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "com_github_cncf_xds": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "strip_prefix": "xds-e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7", + "sha256": "0d33b83f8c6368954e72e7785539f0d272a8aba2f6e2e336ed15fd1514bc9899", + "urls": [ + "https://github.com/cncf/xds/archive/e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7.tar.gz" + ] + } + }, + "io_grpc_grpc_proto": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "729ac127a003836d539ed9da72a21e094aac4c4609e0481d6fc9e28a844e11af", + "strip_prefix": "grpc-proto-4f245d272a28a680606c0739753506880cf33b5f", + "urls": [ + "https://github.com/grpc/grpc-proto/archive/4f245d272a28a680606c0739753506880cf33b5f.zip" + ] + } + }, + "envoy_api": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "c4c9c43903e413924b0cb08e9747f3c3a0727ad221a3c446a326db32def18c60", + "strip_prefix": "data-plane-api-1611a7304794e13efe2d26f8480a2d2473a528c5", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/1611a7304794e13efe2d26f8480a2d2473a528c5.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/1611a7304794e13efe2d26f8480a2d2473a528c5.tar.gz" + ], + "patch_args": [ + "-p1" + ], + "patches": [ + "@@grpc-java+//:buildscripts/data-plane-api-no-envoy.patch" + ] + } + } + }, + "recordedRepoMappingEntries": [ + [ + "grpc-java+", + "bazel_tools", + "bazel_tools" + ] + ] + } + }, + "@@prometheus-cpp+//bazel:repositories.bzl%data_deps_ext": { + "general": { + "bzlTransitiveDigest": "YyamvOwRt8TCm8wkE1VfqN5z2TXiw9rW3pS6Zmvndfc=", + "usagesDigest": "Bo0wbCUm0DynbDnxtSFRZfQw2PTuA6g3uMEf9pgfoYY=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "civetweb": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "strip_prefix": "civetweb-1.16", + "sha256": "f0e471c1bf4e7804a6cfb41ea9d13e7d623b2bcc7bc1e2a4dd54951a24d60285", + "urls": [ + "https://github.com/civetweb/civetweb/archive/v1.16.tar.gz" + ], + "build_file": "@@prometheus-cpp+//bazel:civetweb.BUILD" + } + }, + "com_github_curl": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "sha256": "05fc17ff25b793a437a0906e0484b82172a9f4de02be5ed447e0cab8c3475add", + "strip_prefix": "curl-8.5.0", + "urls": [ + "https://github.com/curl/curl/releases/download/curl-8_5_0/curl-8.5.0.tar.gz", + "https://curl.haxx.se/download/curl-8.5.0.tar.gz" + ], + "build_file": "@@prometheus-cpp+//bazel:curl.BUILD" + } + } + }, + "recordedRepoMappingEntries": [ + [ + "prometheus-cpp+", + "bazel_tools", + "bazel_tools" + ] + ] + } + }, "@@pybind11_bazel+//:internal_configure.bzl%internal_configure_extension": { "general": { "bzlTransitiveDigest": "vyKH4VZgvJxNRuv2Dn3yUi/i7TcjLFk2up5SgTbIUY8=", @@ -721,6 +992,423 @@ ] } }, + "@@rules_apple+//apple:apple.bzl%provisioning_profile_repository_extension": { + "general": { + "bzlTransitiveDigest": "eFz1koWdXXXXBN8G/ZNOxCdzIaYmqtH2b5TYf8w/ZC8=", + "usagesDigest": "pS5nskWKqJmyQrAbunwjEcDsK6cHF7JOAXgEofCmj7k=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "local_provisioning_profiles": { + "repoRuleId": "@@rules_apple+//apple/internal:local_provisioning_profiles.bzl%provisioning_profile_repository", + "attributes": {} + } + }, + "recordedRepoMappingEntries": [ + [ + "apple_support+", + "bazel_skylib", + "bazel_skylib+" + ], + [ + "bazel_tools", + "rules_cc", + "rules_cc+" + ], + [ + "rules_apple+", + "bazel_skylib", + "bazel_skylib+" + ], + [ + "rules_apple+", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_apple+", + "build_bazel_apple_support", + "apple_support+" + ], + [ + "rules_apple+", + "build_bazel_rules_swift", + "rules_swift+" + ], + [ + "rules_cc+", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_cc+", + "rules_cc", + "rules_cc+" + ], + [ + "rules_swift+", + "bazel_skylib", + "bazel_skylib+" + ], + [ + "rules_swift+", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_swift+", + "build_bazel_apple_support", + "apple_support+" + ], + [ + "rules_swift+", + "build_bazel_rules_swift", + "rules_swift+" + ] + ] + } + }, + "@@rules_foreign_cc+//foreign_cc:extensions.bzl%tools": { + "general": { + "bzlTransitiveDigest": "MW4A97mMGuraW70byeL5iUdP+6qprG8t1UShiMJdD8s=", + "usagesDigest": "PKJ/4yUmwmF/SjJ2HH9Xrp2gl5+NxehlhcdWxBLeWLI=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "rules_foreign_cc_framework_toolchain_linux": { + "repoRuleId": "@@rules_foreign_cc+//foreign_cc/private/framework:toolchain.bzl%framework_toolchain_repository", + "attributes": { + "commands_src": "@rules_foreign_cc//foreign_cc/private/framework/toolchains:linux_commands.bzl", + "exec_compatible_with": [ + "@platforms//os:linux" + ] + } + }, + "rules_foreign_cc_framework_toolchain_freebsd": { + "repoRuleId": "@@rules_foreign_cc+//foreign_cc/private/framework:toolchain.bzl%framework_toolchain_repository", + "attributes": { + "commands_src": "@rules_foreign_cc//foreign_cc/private/framework/toolchains:freebsd_commands.bzl", + "exec_compatible_with": [ + "@platforms//os:freebsd" + ] + } + }, + "rules_foreign_cc_framework_toolchain_windows": { + "repoRuleId": "@@rules_foreign_cc+//foreign_cc/private/framework:toolchain.bzl%framework_toolchain_repository", + "attributes": { + "commands_src": "@rules_foreign_cc//foreign_cc/private/framework/toolchains:windows_commands.bzl", + "exec_compatible_with": [ + "@platforms//os:windows" + ] + } + }, + "rules_foreign_cc_framework_toolchain_macos": { + "repoRuleId": "@@rules_foreign_cc+//foreign_cc/private/framework:toolchain.bzl%framework_toolchain_repository", + "attributes": { + "commands_src": "@rules_foreign_cc//foreign_cc/private/framework/toolchains:macos_commands.bzl", + "exec_compatible_with": [ + "@platforms//os:macos" + ] + } + }, + "rules_foreign_cc_framework_toolchains": { + "repoRuleId": "@@rules_foreign_cc+//foreign_cc/private/framework:toolchain.bzl%framework_toolchain_repository_hub", + "attributes": {} + }, + "cmake_src": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "filegroup(\n name = \"all_srcs\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n", + "sha256": "a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68", + "strip_prefix": "cmake-3.31.7", + "urls": [ + "https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7.tar.gz" + ], + "patches": [ + "@@rules_foreign_cc+//toolchains/patches:cmake-c++11.patch" + ] + } + }, + "gnumake_src": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "filegroup(\n name = \"all_srcs\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n", + "sha256": "dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3", + "strip_prefix": "make-4.4.1", + "urls": [ + "https://mirror.bazel.build/ftpmirror.gnu.org/gnu/make/make-4.4.1.tar.gz", + "http://ftpmirror.gnu.org/gnu/make/make-4.4.1.tar.gz" + ] + } + }, + "ninja_build_src": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "filegroup(\n name = \"all_srcs\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n", + "integrity": "sha256-ghvf9Io/aDvEuztvC1/nstZHz2XVKutjMoyRpsbfKFo=", + "strip_prefix": "ninja-1.12.1", + "urls": [ + "https://mirror.bazel.build/github.com/ninja-build/ninja/archive/v1.12.1.tar.gz", + "https://github.com/ninja-build/ninja/archive/v1.12.1.tar.gz" + ] + } + }, + "meson_src": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "exports_files([\"meson.py\"])\n\nfilegroup(\n name = \"runtime\",\n # NOTE: excluding __pycache__ is important to avoid rebuilding due to pyc\n # files, see https://github.com/bazel-contrib/rules_foreign_cc/issues/1342\n srcs = glob([\"mesonbuild/**\"], exclude = [\"**/__pycache__/*\"]),\n visibility = [\"//visibility:public\"],\n)\n", + "sha256": "567e533adf255de73a2de35049b99923caf872a455af9ce03e01077e0d384bed", + "strip_prefix": "meson-1.5.1", + "urls": [ + "https://mirror.bazel.build/github.com/mesonbuild/meson/releases/download/1.5.1/meson-1.5.1.tar.gz", + "https://github.com/mesonbuild/meson/releases/download/1.5.1/meson-1.5.1.tar.gz" + ] + } + }, + "glib_dev": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "\ncc_import(\n name = \"glib_dev\",\n hdrs = glob([\"include/**\"]),\n shared_library = \"@glib_runtime//:bin/libglib-2.0-0.dll\",\n visibility = [\"//visibility:public\"],\n)\n ", + "sha256": "bdf18506df304d38be98a4b3f18055b8b8cca81beabecad0eece6ce95319c369", + "urls": [ + "https://mirror.bazel.build/download.gnome.org/binaries/win64/glib/2.26/glib-dev_2.26.1-1_win64.zip", + "https://download.gnome.org/binaries/win64/glib/2.26/glib-dev_2.26.1-1_win64.zip" + ] + } + }, + "glib_src": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "\ncc_import(\n name = \"msvc_hdr\",\n hdrs = [\"msvc_recommended_pragmas.h\"],\n visibility = [\"//visibility:public\"],\n)\n ", + "sha256": "bc96f63112823b7d6c9f06572d2ad626ddac7eb452c04d762592197f6e07898e", + "strip_prefix": "glib-2.26.1", + "urls": [ + "https://mirror.bazel.build/download.gnome.org/sources/glib/2.26/glib-2.26.1.tar.gz", + "https://download.gnome.org/sources/glib/2.26/glib-2.26.1.tar.gz" + ] + } + }, + "glib_runtime": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "\nexports_files(\n [\n \"bin/libgio-2.0-0.dll\",\n \"bin/libglib-2.0-0.dll\",\n \"bin/libgmodule-2.0-0.dll\",\n \"bin/libgobject-2.0-0.dll\",\n \"bin/libgthread-2.0-0.dll\",\n ],\n visibility = [\"//visibility:public\"],\n)\n ", + "sha256": "88d857087e86f16a9be651ee7021880b3f7ba050d34a1ed9f06113b8799cb973", + "urls": [ + "https://mirror.bazel.build/download.gnome.org/binaries/win64/glib/2.26/glib_2.26.1-1_win64.zip", + "https://download.gnome.org/binaries/win64/glib/2.26/glib_2.26.1-1_win64.zip" + ] + } + }, + "gettext_runtime": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "\ncc_import(\n name = \"gettext_runtime\",\n shared_library = \"bin/libintl-8.dll\",\n visibility = [\"//visibility:public\"],\n)\n ", + "sha256": "1f4269c0e021076d60a54e98da6f978a3195013f6de21674ba0edbc339c5b079", + "urls": [ + "https://mirror.bazel.build/download.gnome.org/binaries/win64/dependencies/gettext-runtime_0.18.1.1-2_win64.zip", + "https://download.gnome.org/binaries/win64/dependencies/gettext-runtime_0.18.1.1-2_win64.zip" + ] + } + }, + "pkgconfig_src": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file_content": "filegroup(\n name = \"all_srcs\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n", + "sha256": "6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591", + "strip_prefix": "pkg-config-0.29.2", + "patches": [ + "@@rules_foreign_cc+//toolchains/patches:pkgconfig-detectenv.patch", + "@@rules_foreign_cc+//toolchains/patches:pkgconfig-makefile-vc.patch", + "@@rules_foreign_cc+//toolchains/patches:pkgconfig-builtin-glib-int-conversion.patch" + ], + "urls": [ + "https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz", + "https://mirror.bazel.build/pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz" + ] + } + }, + "cmake-3.31.7-linux-aarch64": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-linux-aarch64.tar.gz" + ], + "sha256": "e5b2dc2aefdca10afe09c8fa4ee2bbb4e732665943a94322f99c118781910c3c", + "strip_prefix": "cmake-3.31.7-linux-aarch64", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"cmake_bin\",\n srcs = [\"bin/cmake\"],\n)\n\nfilegroup(\n name = \"cmake_data\",\n srcs = glob(\n [\n \"**\",\n ],\n exclude = [\n \"WORKSPACE\",\n \"WORKSPACE.bazel\",\n \"BUILD\",\n \"BUILD.bazel\",\n \"**/* *\",\n ],\n ),\n)\n\nnative_tool_toolchain(\n name = \"cmake_tool\",\n path = \"bin/cmake\",\n target = \":cmake_data\",\n env = {\"CMAKE\": \"$(execpath :cmake_bin)\"},\n tools = [\":cmake_bin\"],\n)\n" + } + }, + "cmake-3.31.7-linux-x86_64": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-linux-x86_64.tar.gz" + ], + "sha256": "14e15d0b445dbeac686acc13fe13b3135e8307f69ccf4c5c91403996ce5aa2d4", + "strip_prefix": "cmake-3.31.7-linux-x86_64", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"cmake_bin\",\n srcs = [\"bin/cmake\"],\n)\n\nfilegroup(\n name = \"cmake_data\",\n srcs = glob(\n [\n \"**\",\n ],\n exclude = [\n \"WORKSPACE\",\n \"WORKSPACE.bazel\",\n \"BUILD\",\n \"BUILD.bazel\",\n \"**/* *\",\n ],\n ),\n)\n\nnative_tool_toolchain(\n name = \"cmake_tool\",\n path = \"bin/cmake\",\n target = \":cmake_data\",\n env = {\"CMAKE\": \"$(execpath :cmake_bin)\"},\n tools = [\":cmake_bin\"],\n)\n" + } + }, + "cmake-3.31.7-macos-universal": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-macos-universal.tar.gz" + ], + "sha256": "1cb11aa2edae8551bb0f22807c6f5246bd0eb60ae9fa1474781eb4095d299aca", + "strip_prefix": "cmake-3.31.7-macos-universal/CMake.app/Contents", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"cmake_bin\",\n srcs = [\"bin/cmake\"],\n)\n\nfilegroup(\n name = \"cmake_data\",\n srcs = glob(\n [\n \"**\",\n ],\n exclude = [\n \"WORKSPACE\",\n \"WORKSPACE.bazel\",\n \"BUILD\",\n \"BUILD.bazel\",\n \"**/* *\",\n ],\n ),\n)\n\nnative_tool_toolchain(\n name = \"cmake_tool\",\n path = \"bin/cmake\",\n target = \":cmake_data\",\n env = {\"CMAKE\": \"$(execpath :cmake_bin)\"},\n tools = [\":cmake_bin\"],\n)\n" + } + }, + "cmake-3.31.7-windows-i386": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-windows-i386.zip" + ], + "sha256": "9d545715a45efb5fada0e687ec274629c590296037f21181c30ea5c2e079277e", + "strip_prefix": "cmake-3.31.7-windows-i386", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"cmake_bin\",\n srcs = [\"bin/cmake.exe\"],\n)\n\nfilegroup(\n name = \"cmake_data\",\n srcs = glob(\n [\n \"**\",\n ],\n exclude = [\n \"WORKSPACE\",\n \"WORKSPACE.bazel\",\n \"BUILD\",\n \"BUILD.bazel\",\n \"**/* *\",\n ],\n ),\n)\n\nnative_tool_toolchain(\n name = \"cmake_tool\",\n path = \"bin/cmake.exe\",\n target = \":cmake_data\",\n env = {\"CMAKE\": \"$(execpath :cmake_bin)\"},\n tools = [\":cmake_bin\"],\n)\n" + } + }, + "cmake-3.31.7-windows-x86_64": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/Kitware/CMake/releases/download/v3.31.7/cmake-3.31.7-windows-x86_64.zip" + ], + "sha256": "ab1c7f46a1b1314f9fcb766c2573148679af599d94c5566bc12b8b35bb563362", + "strip_prefix": "cmake-3.31.7-windows-x86_64", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"cmake_bin\",\n srcs = [\"bin/cmake.exe\"],\n)\n\nfilegroup(\n name = \"cmake_data\",\n srcs = glob(\n [\n \"**\",\n ],\n exclude = [\n \"WORKSPACE\",\n \"WORKSPACE.bazel\",\n \"BUILD\",\n \"BUILD.bazel\",\n \"**/* *\",\n ],\n ),\n)\n\nnative_tool_toolchain(\n name = \"cmake_tool\",\n path = \"bin/cmake.exe\",\n target = \":cmake_data\",\n env = {\"CMAKE\": \"$(execpath :cmake_bin)\"},\n tools = [\":cmake_bin\"],\n)\n" + } + }, + "cmake_3.31.7_toolchains": { + "repoRuleId": "@@rules_foreign_cc+//toolchains:prebuilt_toolchains_repository.bzl%prebuilt_toolchains_repository", + "attributes": { + "repos": { + "cmake-3.31.7-linux-aarch64": [ + "@platforms//cpu:aarch64", + "@platforms//os:linux" + ], + "cmake-3.31.7-linux-x86_64": [ + "@platforms//cpu:x86_64", + "@platforms//os:linux" + ], + "cmake-3.31.7-macos-universal": [ + "@platforms//os:macos" + ], + "cmake-3.31.7-windows-i386": [ + "@platforms//cpu:x86_32", + "@platforms//os:windows" + ], + "cmake-3.31.7-windows-x86_64": [ + "@platforms//cpu:x86_64", + "@platforms//os:windows" + ] + }, + "tool": "cmake" + } + }, + "ninja_1.12.1_linux": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip" + ], + "sha256": "6f98805688d19672bd699fbbfa2c2cf0fc054ac3df1f0e6a47664d963d530255", + "strip_prefix": "", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"ninja_bin\",\n srcs = [\"ninja\"],\n)\n\nnative_tool_toolchain(\n name = \"ninja_tool\",\n env = {\"NINJA\": \"$(execpath :ninja_bin)\"},\n path = \"$(execpath :ninja_bin)\",\n target = \":ninja_bin\",\n)\n" + } + }, + "ninja_1.12.1_linux-aarch64": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux-aarch64.zip" + ], + "sha256": "5c25c6570b0155e95fce5918cb95f1ad9870df5768653afe128db822301a05a1", + "strip_prefix": "", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"ninja_bin\",\n srcs = [\"ninja\"],\n)\n\nnative_tool_toolchain(\n name = \"ninja_tool\",\n env = {\"NINJA\": \"$(execpath :ninja_bin)\"},\n path = \"$(execpath :ninja_bin)\",\n target = \":ninja_bin\",\n)\n" + } + }, + "ninja_1.12.1_mac": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip" + ], + "sha256": "89a287444b5b3e98f88a945afa50ce937b8ffd1dcc59c555ad9b1baf855298c9", + "strip_prefix": "", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"ninja_bin\",\n srcs = [\"ninja\"],\n)\n\nnative_tool_toolchain(\n name = \"ninja_tool\",\n env = {\"NINJA\": \"$(execpath :ninja_bin)\"},\n path = \"$(execpath :ninja_bin)\",\n target = \":ninja_bin\",\n)\n" + } + }, + "ninja_1.12.1_mac_aarch64": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip" + ], + "sha256": "89a287444b5b3e98f88a945afa50ce937b8ffd1dcc59c555ad9b1baf855298c9", + "strip_prefix": "", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"ninja_bin\",\n srcs = [\"ninja\"],\n)\n\nnative_tool_toolchain(\n name = \"ninja_tool\",\n env = {\"NINJA\": \"$(execpath :ninja_bin)\"},\n path = \"$(execpath :ninja_bin)\",\n target = \":ninja_bin\",\n)\n" + } + }, + "ninja_1.12.1_win": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" + ], + "sha256": "f550fec705b6d6ff58f2db3c374c2277a37691678d6aba463adcbb129108467a", + "strip_prefix": "", + "build_file_content": "load(\"@rules_foreign_cc//toolchains/native_tools:native_tools_toolchain.bzl\", \"native_tool_toolchain\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nfilegroup(\n name = \"ninja_bin\",\n srcs = [\"ninja.exe\"],\n)\n\nnative_tool_toolchain(\n name = \"ninja_tool\",\n env = {\"NINJA\": \"$(execpath :ninja_bin)\"},\n path = \"$(execpath :ninja_bin)\",\n target = \":ninja_bin\",\n)\n" + } + }, + "ninja_1.12.1_toolchains": { + "repoRuleId": "@@rules_foreign_cc+//toolchains:prebuilt_toolchains_repository.bzl%prebuilt_toolchains_repository", + "attributes": { + "repos": { + "ninja_1.12.1_linux": [ + "@platforms//cpu:x86_64", + "@platforms//os:linux" + ], + "ninja_1.12.1_linux-aarch64": [ + "@platforms//cpu:aarch64", + "@platforms//os:linux" + ], + "ninja_1.12.1_mac": [ + "@platforms//cpu:x86_64", + "@platforms//os:macos" + ], + "ninja_1.12.1_mac_aarch64": [ + "@platforms//cpu:aarch64", + "@platforms//os:macos" + ], + "ninja_1.12.1_win": [ + "@platforms//cpu:x86_64", + "@platforms//os:windows" + ] + }, + "tool": "ninja" + } + } + }, + "recordedRepoMappingEntries": [ + [ + "rules_foreign_cc+", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_foreign_cc+", + "rules_foreign_cc", + "rules_foreign_cc+" + ] + ] + } + }, "@@rules_fuzzing+//fuzzing/private:extensions.bzl%non_module_dependencies": { "general": { "bzlTransitiveDigest": "lxvzPQyluk241QRYY81nZHOcv5Id/5U2y6dp42qibis=", @@ -6031,6 +6719,34 @@ ] ] } + }, + "@@upb+//:non_module_deps.bzl%non_module_deps": { + "general": { + "bzlTransitiveDigest": "uwA8R65sP1N0aIB7QCqj6/CPFadtvCnFTi4O8Uv0SJw=", + "usagesDigest": "ZQAFQ5EzlQTGUMlqsQVRreRnKmfeuJJ07zpMcfBrbr4=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "utf8_range": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/protocolbuffers/utf8_range/archive/de0b4a8ff9b5d4c98108bdfe723291a33c52c54f.zip" + ], + "strip_prefix": "utf8_range-de0b4a8ff9b5d4c98108bdfe723291a33c52c54f", + "sha256": "5da960e5e5d92394c809629a03af3c7709d2d3d0ca731dacb3a9fb4bf28f7702" + } + } + }, + "recordedRepoMappingEntries": [ + [ + "upb+", + "bazel_tools", + "bazel_tools" + ] + ] + } } } } diff --git a/site/en/docs/cc-toolchain-config-reference.md b/site/en/docs/cc-toolchain-config-reference.md index 0372725d27ac34..febd249c5b7ef0 100644 --- a/site/en/docs/cc-toolchain-config-reference.md +++ b/site/en/docs/cc-toolchain-config-reference.md @@ -1099,7 +1099,22 @@ conditions. If enabled, virtual include header files are linked under bin/_virtual_includes/<hash of target path> instead of bin/<target package path>/_virtual_includes/<target name>. Useful on Windows to avoid long path issue with MSVC. - + + + coverage_enabled + + + Enabled when coverage collection is generally enabled. + + + + coverage_instrumented + + + Enabled when the current target should be instrumented for + coverage. + + #### Legacy features patching logic {:#legacy-features-patching-logic} @@ -1157,4 +1172,3 @@ done. For the curious reader see the implementation in [CppActionConfigs](https://source.bazel.build/bazel/+/master:src/main/java/com/google/devtools/build/lib/rules/cpp/CppActionConfigs.java?q=cppactionconfigs&ss=bazel), and for production toolchains consider adding `no_legacy_features` to make the toolchain more standalone. - diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index fd88168e56b05d..1e2f63a28e57bb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java @@ -341,19 +341,6 @@ public Sequence getLooseIncludeDirsForStarlark() { return StarlarkList.empty(); } - public static ImmutableList getCoverageFeatures(CppConfiguration cppConfiguration) { - ImmutableList.Builder coverageFeatures = ImmutableList.builder(); - if (cppConfiguration.collectCodeCoverage()) { - coverageFeatures.add(CppRuleClasses.COVERAGE); - if (cppConfiguration.useLLVMCoverageMapFormat()) { - coverageFeatures.add(CppRuleClasses.LLVM_COVERAGE_MAP_FORMAT); - } else { - coverageFeatures.add(CppRuleClasses.GCC_COVERAGE_MAP_FORMAT); - } - } - return coverageFeatures.build(); - } - /** * Creates a feature configuration for a given rule. Assumes strictly cc sources. * @@ -468,8 +455,6 @@ public static FeatureConfiguration configureFeaturesOrThrowEvalException( } } - allFeatures.addAll(getCoverageFeatures(cppConfiguration)); - if (!allUnsupportedFeatures.contains(CppRuleClasses.FDO_INSTRUMENT)) { if (cppConfiguration.getFdoInstrument() != null) { allFeatures.add(CppRuleClasses.FDO_INSTRUMENT); @@ -630,8 +615,11 @@ private static List computeCcFlagsFromFeatureConfig( if (featureConfiguration.actionIsConfigured(CppActionNames.CC_FLAGS_MAKE_VARIABLE)) { try { CcToolchainVariables buildVariables = toolchainProvider.getBuildVars(); - return CppHelper.getCommandLine( - ruleContext, featureConfiguration, buildVariables, CppActionNames.CC_FLAGS_MAKE_VARIABLE); + return CppHelper.getCommandLine( + ruleContext, + featureConfiguration, + buildVariables, + CppActionNames.CC_FLAGS_MAKE_VARIABLE); } catch (EvalException e) { throw new RuleErrorException(e.getMessage()); diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java index ee87181390416c..88b806d3db1721 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.rules.cpp; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -26,15 +25,12 @@ import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.RuleErrorConsumer; -import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.actions.ActionConstructionContext; import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue; import com.google.devtools.build.lib.analysis.config.PerLabelOptions; -import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; -import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.rules.cpp.CcCommon.CoptsFilter; import com.google.devtools.build.lib.rules.cpp.CcCommon.Language; @@ -297,7 +293,6 @@ public CcCompilationContext getCcCompilationContext() { private String purpose = ""; private boolean generateNoPicAction; private boolean generatePicAction; - private boolean isCodeCoverageEnabled = true; private String stripIncludePrefix = null; private String includePrefix = null; @@ -727,12 +722,6 @@ public CcCompilationHelper setStripIncludePrefix(@Nullable String stripIncludePr return this; } - @CanIgnoreReturnValue - public CcCompilationHelper setCodeCoverageEnabled(boolean codeCoverageEnabled) { - this.isCodeCoverageEnabled = codeCoverageEnabled; - return this; - } - private static StarlarkList convertPathFragmentsToStarlarkList( Iterable pathFragments) { ImmutableList.Builder pathStrings = ImmutableList.builder(); @@ -1040,7 +1029,6 @@ private CcCompilationOutputs createCcCompileActions() : ArtifactCategory.OBJECT_FILE, ccCompilationContext.getCppModuleMap(), /* addObject= */ true, - isCodeCoverageEnabled, // The source action does not generate dwo when it has bitcode // output (since it isn't generating a native object with debug // info). In that case the LtoBackendAction will generate the dwo. @@ -1127,7 +1115,7 @@ private Artifact createCompileActionTemplate( ImmutableList outputCategories, boolean usePic, boolean bitcodeOutput) - throws RuleErrorException, EvalException, InterruptedException { + throws RuleErrorException, EvalException { if (usePic) { builder = new CppCompileActionBuilder(builder).setPicMode(true); } @@ -1144,7 +1132,6 @@ private Artifact createCompileActionTemplate( usePic, /* needsFdoBuildVariables= */ false, ccCompilationContext.getCppModuleMap(), - /* enableCoverage= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, @@ -1271,13 +1258,12 @@ private CcToolchainVariables setupCompileBuildVariables( boolean usePic, boolean needsFdoBuildVariables, CppModuleMap cppModuleMap, - boolean enableCoverage, Artifact gcnoFile, boolean isUsingFission, Artifact dwoFile, Artifact ltoIndexingFile, ImmutableMap additionalBuildVariables) - throws RuleErrorException, EvalException, InterruptedException { + throws RuleErrorException, EvalException { Artifact sourceFile = builder.getSourceFile(); if (needsFdoBuildVariables && fdoContext.hasArtifacts()) { // This modifies the passed-in builder, which is a surprising side-effect, and makes it unsafe @@ -1353,7 +1339,6 @@ private CcToolchainVariables setupCompileBuildVariables( buildVariables, sourceFile, builder.getOutputFile(), - enableCoverage, gcnoFile, dwoFile, isUsingFission, @@ -1406,7 +1391,8 @@ private void createModuleCodegenAction( ccToolchain, ArtifactCategory.COVERAGE_DATA_FILE, outputName); // TODO(djasper): This is now duplicated. Refactor the various create..Action functions. Artifact gcnoFile = - isCodeCoverageEnabled && !cppConfiguration.useLLVMCoverageMapFormat() + featureConfiguration.getRequestedFeatures().contains(CppRuleClasses.COVERAGE_INSTRUMENTED) + && !cppConfiguration.useLLVMCoverageMapFormat() ? CppHelper.getCompileOutputArtifact( actionConstructionContext, label, gcnoFileName, configuration) : null; @@ -1427,7 +1413,6 @@ private void createModuleCodegenAction( /* usePic= */ pic, /* needsFdoBuildVariables= */ ccRelativeName != null, ccCompilationContext.getCppModuleMap(), - isCodeCoverageEnabled, gcnoFile, generateDwo, dwoFile, @@ -1474,7 +1459,6 @@ private void createHeaderAction( generatePicAction, /* needsFdoBuildVariables= */ false, ccCompilationContext.getCppModuleMap(), - /* enableCoverage= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, @@ -1507,7 +1491,6 @@ private ImmutableList createModuleAction( ArtifactCategory.CPP_MODULE, cppModuleMap, /* addObject= */ false, - /* enableCoverage= */ false, /* generateDwo= */ false, /* bitcodeOutput= */ false); } @@ -1522,7 +1505,6 @@ private ImmutableList createSourceAction( ArtifactCategory outputCategory, CppModuleMap cppModuleMap, boolean addObject, - boolean enableCoverage, boolean generateDwo, boolean bitcodeOutput) throws RuleErrorException, EvalException, InterruptedException { @@ -1544,7 +1526,6 @@ private ImmutableList createSourceAction( outputCategory, cppModuleMap, addObject, - enableCoverage, generateDwo, bitcodeOutput, ccRelativeName, @@ -1567,7 +1548,6 @@ private ImmutableList createSourceAction( outputCategory, cppModuleMap, addObject, - enableCoverage, generateDwo, bitcodeOutput, ccRelativeName, @@ -1590,13 +1570,12 @@ private Artifact createSourceActionHelper( ArtifactCategory outputCategory, CppModuleMap cppModuleMap, boolean addObject, - boolean enableCoverage, boolean generateDwo, boolean bitcodeOutput, PathFragment ccRelativeName, boolean usePic, ImmutableMap additionalBuildVariables) - throws RuleErrorException, EvalException, InterruptedException { + throws RuleErrorException, EvalException { builder.setOutputs( actionConstructionContext, ruleErrorConsumer, @@ -1610,7 +1589,8 @@ private Artifact createSourceActionHelper( getOutputNameBaseWith(outputName, usePic)); Artifact gcnoFile = - enableCoverage && !cppConfiguration.useLLVMCoverageMapFormat() + featureConfiguration.getRequestedFeatures().contains(CppRuleClasses.COVERAGE_INSTRUMENTED) + && !cppConfiguration.useLLVMCoverageMapFormat() ? CppHelper.getCompileOutputArtifact( actionConstructionContext, label, gcnoFileName, configuration) : null; @@ -1625,7 +1605,6 @@ private Artifact createSourceActionHelper( usePic, /* needsFdoBuildVariables= */ ccRelativeName != null && addObject, cppModuleMap, - enableCoverage, gcnoFile, generateDwo, dwoFile, @@ -1679,41 +1658,6 @@ String getOutputNameBaseWith(String base, boolean usePic) throws RuleErrorExcept : base; } - /** Returns true iff code coverage is enabled for the given target. */ - public static boolean isCodeCoverageEnabled(RuleContext ruleContext) { - BuildConfigurationValue configuration = ruleContext.getConfiguration(); - if (configuration.isCodeCoverageEnabled()) { - // If rule is matched by the instrumentation filter, enable instrumentation - if (InstrumentedFilesCollector.shouldIncludeLocalSources( - configuration, ruleContext.getLabel(), ruleContext.isTestTarget())) { - return true; - } - // At this point the rule itself is not matched by the instrumentation filter. However, we - // might still want to instrument C++ rules if one of the targets listed in "deps" is - // instrumented and, therefore, can supply header files that we would want to collect code - // coverage for. For example, think about cc_test rule that tests functionality defined in a - // header file that is supplied by the cc_library. - // - // Note that we only check direct prerequisites and not the transitive closure. This is done - // for two reasons: - // a) It is a good practice to declare libraries which you directly rely on. Including headers - // from a library hidden deep inside the transitive closure makes build dependencies less - // readable and can lead to unexpected breakage. - // b) Traversing the transitive closure for each C++ compile action would require more complex - // implementation (with caching results of this method) to avoid O(N^2) slowdown. - if (ruleContext.getRule().isAttrDefined("deps", BuildType.LABEL_LIST)) { - for (TransitiveInfoCollection dep : ruleContext.getPrerequisites("deps")) { - CcInfo ccInfo = dep.get(CcInfo.PROVIDER); - if (ccInfo != null - && InstrumentedFilesCollector.shouldIncludeLocalSources(configuration, dep)) { - return true; - } - } - } - } - return false; - } - private ImmutableList collectPerFileCopts(Artifact sourceFile, Label sourceLabel) { return cppConfiguration.getPerFileCopts().stream() .filter( @@ -1748,7 +1692,7 @@ private ImmutableList createTempsActions( CppCompileActionBuilder builder, boolean usePic, PathFragment ccRelativeName) - throws RuleErrorException, EvalException, InterruptedException { + throws RuleErrorException, EvalException { if (!cppConfiguration.getSaveTemps()) { return ImmutableList.of(); } @@ -1778,7 +1722,6 @@ private ImmutableList createTempsActions( usePic, /* needsFdoBuildVariables= */ ccRelativeName != null, ccCompilationContext.getCppModuleMap(), - /* enableCoverage= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, @@ -1804,7 +1747,6 @@ private ImmutableList createTempsActions( usePic, /* needsFdoBuildVariables= */ ccRelativeName != null, ccCompilationContext.getCppModuleMap(), - /* enableCoverage= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java index 5a41fd234acfe5..7f185b55dd7c45 100755 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java @@ -301,7 +301,6 @@ public CcToolchainVariables getCompileBuildVariables( ccToolchainProvider, convertFromNoneable(sourceFile, /* defaultValue= */ null), convertFromNoneable(outputFile, /* defaultValue= */ null), - /* isCodeCoverageEnabled= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, @@ -1605,7 +1604,6 @@ public Tuple compile( Object additionalModuleMapsNoneable, Object propagateModuleMapToCompileActionObject, Object doNotGenerateModuleMapObject, - Object codeCoverageEnabledObject, Object hdrsCheckingModeObject, Object variablesExtension, Object languageObject, @@ -1651,7 +1649,7 @@ public Tuple compile( asClassImmutableList(additionalModuleMapsNoneable); String coptsFilterRegex = convertFromNoneable(coptsFilterObject, /* defaultValue= */ null); - CoptsFilter coptsFilter = null; + CoptsFilter coptsFilter; if (Strings.isNullOrEmpty(coptsFilterRegex)) { coptsFilter = CoptsFilter.alwaysPasses(); } else { @@ -1678,8 +1676,6 @@ public Tuple compile( convertFromNoneable(propagateModuleMapToCompileActionObject, /* defaultValue= */ true); boolean doNotGenerateModuleMap = convertFromNoneable(doNotGenerateModuleMapObject, /* defaultValue= */ false); - boolean codeCoverageEnabled = - convertFromNoneable(codeCoverageEnabledObject, /* defaultValue= */ false); String purpose = convertFromNoneable(purposeObject, null); ImmutableList implementationContexts = asClassImmutableList(implementationCcCompilationContextsObject); @@ -1757,8 +1753,7 @@ public Tuple compile( .setPurpose(defaultPurpose) .addAdditionalExportedHeaders( additionalExportedHeaders.stream().map(PathFragment::create).collect(toImmutableList())) - .setPropagateModuleMapToCompileAction(propagateModuleMapToCompileAction) - .setCodeCoverageEnabled(codeCoverageEnabled); + .setPropagateModuleMapToCompileAction(propagateModuleMapToCompileAction); if (textualHeadersObject instanceof NestedSet) { compilationHelper.addPublicTextualHeaders( @@ -1772,9 +1767,7 @@ public Tuple compile( if (moduleMap != null) { compilationHelper.setCppModuleMap(moduleMap); } - if (coptsFilter != null) { - compilationHelper.setCoptsFilter(coptsFilter); - } + compilationHelper.setCoptsFilter(coptsFilter); for (CppModuleMap additionalModuleMap : additionalModuleMaps) { compilationHelper.registerAdditionalModuleMap(additionalModuleMap); } @@ -1986,7 +1979,7 @@ public void registerLinkstampCompileAction( Object stampingObject, Object additionalLinkstampDefines, StarlarkThread thread) - throws EvalException, InterruptedException, TypeException, RuleErrorException { + throws EvalException, InterruptedException, TypeException { isCalledFromStarlarkCcCommon(thread); RuleContext ruleContext = starlarkActionFactoryApi.getRuleContext(); boolean stamping = @@ -2024,7 +2017,6 @@ public void registerLinkstampCompileAction( .toList(), asStringImmutableList(additionalLinkstampDefines), ccToolchain, - ruleContext.getConfiguration().isCodeCoverageEnabled(), CppHelper.getFdoBuildStamp( cppConfiguration, ccToolchain.getFdoContext(), diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java index b8f8c17e7b8b49..bebd277009592a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java @@ -832,7 +832,6 @@ public StarlarkList createModuleActionForStarlark( name = "feature_configuration", positional = false, named = true), // FeatureConfigurationForStarlark - @Param(name = "is_code_coverage_enabled", positional = false, named = true), @Param(name = "label", positional = false, named = true), @Param(name = "common_toolchain_variables", positional = false, named = true), @Param(name = "fdo_build_variables", positional = false, named = true, defaultValue = "{}"), @@ -855,7 +854,6 @@ public void createModuleCodegenActionForStarlark( StructImpl fdoContext, Depset auxiliaryFdoInputs, FeatureConfigurationForStarlark featureConfigurationForStarlark, - boolean isCodeCoverageEnabled, Label label, CcToolchainVariables commonToolchainVariables, Dict fdoBuildVariables, @@ -881,7 +879,6 @@ public void createModuleCodegenActionForStarlark( new FdoContext(fdoContext), Depset.cast(auxiliaryFdoInputs, Artifact.class, "auxiliary_fdo_inputs"), featureConfigurationForStarlark.getFeatureConfiguration(), - isCodeCoverageEnabled, label, commonToolchainVariables, ImmutableMap.copyOf( @@ -938,7 +935,6 @@ public void createModuleCodegenActionForStarlark( }, defaultValue = "None"), @Param(name = "add_object", positional = false, named = true), - @Param(name = "enable_coverage", positional = false, named = true), @Param(name = "generate_dwo", positional = false, named = true), @Param(name = "bitcode_output", positional = false, named = true) }) @@ -968,7 +964,6 @@ public Sequence createCompileSourceActionFromBuilder( String outputCategoryString, Object cppModuleMapObject, boolean addObject, - boolean enableCoverage, boolean generateDwo, boolean bitcodeOutput) throws RuleErrorException, EvalException, InterruptedException { @@ -1013,7 +1008,6 @@ public Sequence createCompileSourceActionFromBuilder( outputCategory, cppModuleMap, addObject, - enableCoverage, generateDwo, bitcodeOutput)); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStaticCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStaticCompilationHelper.java index 0a461d819eda39..21480d3c6c70be 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStaticCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcStaticCompilationHelper.java @@ -130,7 +130,6 @@ private static CcToolchainVariables setupSpecificCompileBuildVariables( boolean needsFdoBuildVariables, ImmutableMap fdoBuildVariables, CppModuleMap cppModuleMap, - boolean enableCoverage, Artifact gcnoFile, boolean isUsingFission, Artifact dwoFile, @@ -149,7 +148,6 @@ private static CcToolchainVariables setupSpecificCompileBuildVariables( buildVariables, sourceFile, ccCompileActionBuilder.getOutputFile(), - enableCoverage, gcnoFile, dwoFile, isUsingFission, @@ -359,7 +357,6 @@ static Artifact createCompileActionTemplate( /* needsFdoBuildVariables= */ false, fdoBuildVariables, ccCompilationContext.getCppModuleMap(), - /* enableCoverage= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, @@ -441,7 +438,6 @@ static void createModuleCodegenAction( FdoContext fdoContext, NestedSet auxiliaryFdoInputs, FeatureConfiguration featureConfiguration, - boolean isCodeCoverageEnabled, Label label, CcToolchainVariables commonToolchainVariables, ImmutableMap fdoBuildVariables, @@ -470,7 +466,8 @@ static void createModuleCodegenAction( ccToolchain, ArtifactCategory.COVERAGE_DATA_FILE, outputName); // TODO(djasper): This is now duplicated. Refactor the various create..Action functions. Artifact gcnoFile = - isCodeCoverageEnabled && !cppConfiguration.useLLVMCoverageMapFormat() + featureConfiguration.getRequestedFeatures().contains(CppRuleClasses.COVERAGE_INSTRUMENTED) + && !cppConfiguration.useLLVMCoverageMapFormat() ? CppHelper.getCompileOutputArtifact( actionConstructionContext, label, gcnoFileName, configuration) : null; @@ -505,7 +502,6 @@ static void createModuleCodegenAction( /* needsFdoBuildVariables= */ ccRelativeName != null, fdoBuildVariables, ccCompilationContext.getCppModuleMap(), - isCodeCoverageEnabled, gcnoFile, generateDwo, dwoFile, @@ -580,7 +576,6 @@ static void createParseHeaderAction( /* needsFdoBuildVariables= */ false, fdoBuildVariables, ccCompilationContext.getCppModuleMap(), - /* enableCoverage= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, @@ -651,7 +646,6 @@ static ImmutableList createModuleAction( ArtifactCategory.CPP_MODULE, cppModuleMap, /* addObject= */ false, - /* enableCoverage= */ false, /* generateDwo= */ false, /* bitcodeOutput= */ false); } @@ -684,7 +678,6 @@ static ImmutableList createCompileSourceActionFromBuilder( ArtifactCategory outputCategory, CppModuleMap cppModuleMap, boolean addObject, - boolean enableCoverage, boolean generateDwo, boolean bitcodeOutput) throws RuleErrorException, EvalException, InterruptedException { @@ -722,7 +715,6 @@ static ImmutableList createCompileSourceActionFromBuilder( outputCategory, cppModuleMap, addObject, - enableCoverage, generateDwo, bitcodeOutput, ccRelativeName, @@ -761,7 +753,6 @@ static ImmutableList createCompileSourceActionFromBuilder( outputCategory, cppModuleMap, addObject, - enableCoverage, generateDwo, bitcodeOutput, ccRelativeName, @@ -800,7 +791,6 @@ private static Artifact createPicOrNoPicCompileSourceAction( ArtifactCategory outputCategory, CppModuleMap cppModuleMap, boolean addObject, - boolean enableCoverage, boolean generateDwo, boolean bitcodeOutput, PathFragment ccRelativeName, @@ -820,7 +810,8 @@ private static Artifact createPicOrNoPicCompileSourceAction( getOutputNameBaseWith(ccToolchain, outputName, usePic)); Artifact gcnoFile = - enableCoverage && !cppConfiguration.useLLVMCoverageMapFormat() + featureConfiguration.getRequestedFeatures().contains(CppRuleClasses.COVERAGE_INSTRUMENTED) + && !cppConfiguration.useLLVMCoverageMapFormat() ? CppHelper.getCompileOutputArtifact( actionConstructionContext, label, gcnoFileName, configuration) : null; @@ -856,7 +847,6 @@ private static Artifact createPicOrNoPicCompileSourceAction( /* needsFdoBuildVariables= */ ccRelativeName != null && addObject, fdoBuildVariables, cppModuleMap, - enableCoverage, gcnoFile, generateDwo, dwoFile, @@ -994,7 +984,6 @@ private static ImmutableList createTempsActions( /* needsFdoBuildVariables= */ ccRelativeName != null, fdoBuildVariables, ccCompilationContext.getCppModuleMap(), - /* enableCoverage= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, @@ -1031,7 +1020,6 @@ private static ImmutableList createTempsActions( /* needsFdoBuildVariables= */ ccRelativeName != null, fdoBuildVariables, ccCompilationContext.getCppModuleMap(), - /* enableCoverage= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java index ca62673e568852..eee8df99695263 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java @@ -148,7 +148,6 @@ public static CcToolchainVariables setupVariablesOrReportRuleError( CcToolchainProvider ccToolchainProvider, Artifact sourceFile, Artifact outputFile, - boolean isCodeCoverageEnabled, Artifact gcnoFile, boolean isUsingFission, Artifact dwoFile, @@ -180,7 +179,6 @@ public static CcToolchainVariables setupVariablesOrReportRuleError( ccToolchainProvider.getBuildVars(), sourceFile, outputFile, - isCodeCoverageEnabled, gcnoFile, isUsingFission, dwoFile, @@ -212,7 +210,6 @@ public static CcToolchainVariables setupVariablesOrThrowEvalException( CcToolchainProvider ccToolchainProvider, String sourceFile, String outputFile, - boolean isCodeCoverageEnabled, Artifact gcnoFile, boolean isUsingFission, Artifact dwoFile, @@ -247,7 +244,6 @@ public static CcToolchainVariables setupVariablesOrThrowEvalException( ccToolchainProvider.getBuildVars(), sourceFile, outputFile, - isCodeCoverageEnabled, gcnoFile, isUsingFission, dwoFile, @@ -279,7 +275,6 @@ private static CcToolchainVariables setupVariables( CcToolchainVariables parent, Object sourceFile, Object outputFile, - boolean isCodeCoverageEnabled, Artifact gcnoFile, boolean isUsingFission, Artifact dwoFile, @@ -324,7 +319,6 @@ private static CcToolchainVariables setupVariables( buildVariables, sourceFile, outputFile, - isCodeCoverageEnabled, gcnoFile, dwoFile, isUsingFission, @@ -347,7 +341,6 @@ public static void setupSpecificVariables( CcToolchainVariables.Builder buildVariables, Artifact sourceFile, Artifact outputFile, - boolean isCodeCoverageEnabled, Artifact gcnoFile, Artifact dwoFile, boolean isUsingFission, @@ -364,7 +357,6 @@ public static void setupSpecificVariables( buildVariables, sourceFile, outputFile, - isCodeCoverageEnabled, gcnoFile, dwoFile, isUsingFission, @@ -386,7 +378,6 @@ private static void setupSpecificVariables( CcToolchainVariables.Builder buildVariables, Object sourceFile, Object outputFile, - boolean isCodeCoverageEnabled, Artifact gcnoFile, Artifact dwoFile, boolean isUsingFission, @@ -435,9 +426,9 @@ private static void setupSpecificVariables( if (gcnoFile != null) { buildVariables.addVariable(GCOV_GCNO_FILE.getVariableName(), gcnoFile); - } else if (isCodeCoverageEnabled) { - // TODO: Blaze currently uses `gcov_gcno_file` to detect if code coverage is enabled. It - // should use a different signal. + } else if (featureConfiguration.getRequestedFeatures().contains(CppRuleClasses.COVERAGE_INSTRUMENTED)) { + // TODO: Blaze currently uses `gcov_gcno_file` to detect if the current target is instrumented + // for coverage. It should use the `coverage_instrumented` feature instead. buildVariables.addVariable(GCOV_GCNO_FILE.getVariableName(), ""); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java index e41861201d3e13..6fc9ad516f8ec8 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java @@ -492,7 +492,6 @@ public boolean experimentalLinkStaticLibrariesOnce() { return cppOptions.experimentalLinkStaticLibrariesOnce; } - public boolean legacyWholeArchive() { return cppOptions.legacyWholeArchive; } @@ -758,6 +757,7 @@ public Label getMemProfProfileLabel() { return cppOptions.getMemProfProfileLabel(); } + @StarlarkMethod(name = "use_llvm_coverage_map_format", documented = false) public boolean useLLVMCoverageMapFormat() { return cppOptions.useLLVMCoverageMapFormat; } @@ -817,10 +817,6 @@ public boolean dontEnableHostNonhost() { return cppOptions.dontEnableHostNonhost; } - public boolean collectCodeCoverage() { - return collectCodeCoverage; - } - public boolean saveFeatureState() { return cppOptions.saveFeatureState; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java index d9fa2f821f81c4..41c1d3aee4b479 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkstampCompileHelper.java @@ -44,7 +44,6 @@ public static CppCompileAction createLinkstampCompileAction( ImmutableList buildInfoHeaderArtifacts, Iterable additionalLinkstampDefines, CcToolchainProvider ccToolchainProvider, - boolean codeCoverageEnabled, String fdoBuildStamp, FeatureConfiguration featureConfiguration, boolean needsPic, @@ -71,7 +70,6 @@ public static CppCompileAction createLinkstampCompileAction( ccToolchainProvider, needsPic, fdoBuildStamp, - codeCoverageEnabled, semantics)) .setFeatureConfiguration(featureConfiguration) .setSourceFile(sourceFile) @@ -93,15 +91,17 @@ private static Iterable computeAllLinkstampDefines( String outputReplacement, Iterable additionalLinkstampDefines, CcToolchainProvider ccToolchainProvider, - String fdoBuildStamp, - boolean codeCoverageEnabled) + FeatureConfiguration featureConfiguration, + String fdoBuildStamp) throws EvalException { String labelPattern = Pattern.quote("${LABEL}"); String outputPathPattern = Pattern.quote("${OUTPUT_PATH}"); ImmutableList.Builder defines = ImmutableList.builder() .add("GPLATFORM=\"" + ccToolchainProvider.getToolchainIdentifier() + "\"") - .add("BUILD_COVERAGE_ENABLED=" + (codeCoverageEnabled ? "1" : "0")) + .add( + "BUILD_COVERAGE_ENABLED=" + + (featureConfiguration.isEnabled(CppRuleClasses.COVERAGE_ENABLED) ? "1" : "0")) // G3_TARGET_NAME is a C string literal that normally contain the label of the target // being linked. However, they are set differently when using shared native deps. In // that case, a single .so file is shared by multiple targets, and its contents cannot @@ -139,7 +139,6 @@ private static CcToolchainVariables getVariables( CcToolchainProvider ccToolchainProvider, boolean needsPic, String fdoBuildStamp, - boolean codeCoverageEnabled, CppSemantics semantics) throws EvalException { // TODO(b/34761650): Remove all this hardcoding by separating a full blown compile action. @@ -151,7 +150,6 @@ private static CcToolchainVariables getVariables( ccToolchainProvider, sourceFile, outputFile, - /* isCodeCoverageEnabled= */ false, /* gcnoFile= */ null, /* isUsingFission= */ false, /* dwoFile= */ null, @@ -178,8 +176,8 @@ private static CcToolchainVariables getVariables( outputReplacement, additionalLinkstampDefines, ccToolchainProvider, - fdoBuildStamp, - codeCoverageEnabled), + featureConfiguration, + fdoBuildStamp), /* localDefines= */ ImmutableList.of()); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java index 1bf7e00e93f112..cb703f82a6aafe 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java @@ -434,14 +434,20 @@ public static ToolchainTypeRequirement ccToolchainTypeRequirement(RuleDefinition /** A string constant for the xbinaryfdo feature. */ public static final String XBINARYFDO = "xbinaryfdo"; - /** A string constant for the coverage feature. */ + /** A string constant for the legacy coverage feature. */ public static final String COVERAGE = "coverage"; - /** Produce artifacts for coverage in llvm coverage mapping format. */ - public static final String LLVM_COVERAGE_MAP_FORMAT = "llvm_coverage_map_format"; + /** + * A string constant for the feature that is requested if coverage is generally enabled, even if + * the current target is not instrumented. + */ + public static final String COVERAGE_ENABLED = "coverage_enabled"; - /** Produce artifacts for coverage in gcc coverage mapping format. */ - public static final String GCC_COVERAGE_MAP_FORMAT = "gcc_coverage_map_format"; + /** + * A string constant for the feature that is requested if the current target is instrumented for + * coverage. + */ + public static final String COVERAGE_INSTRUMENTED = "coverage_instrumented"; /** A string constant for the match-clif action. */ public static final String MATCH_CLIF = "match_clif"; diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CcModuleApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CcModuleApi.java index 5d8ae0f36e36be..9e4133cd54a0f1 100755 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CcModuleApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CcModuleApi.java @@ -321,13 +321,6 @@ default void compilerFlagExists() {} documented = false, allowedTypes = {@ParamType(type = Boolean.class)}, defaultValue = "unbound"), - @Param( - name = "code_coverage_enabled", - positional = false, - named = true, - documented = false, - allowedTypes = {@ParamType(type = Boolean.class)}, - defaultValue = "unbound"), @Param( name = "hdrs_checking_mode", positional = false, @@ -418,7 +411,6 @@ Tuple compile( Object additionalModuleMapsNoneable, Object propagateModuleMapToCompileActionObject, Object doNotGenerateModuleMapObject, - Object codeCoverageEnabledObject, Object hdrsCheckingModeObject, Object variablesExtension, Object languageObject, diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl index 26a26c470df21c..e84528b3f7c10f 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl @@ -480,6 +480,7 @@ def cc_binary_impl(ctx, additional_linkopts, force_linkstatic = False): ) features = ctx.features features.append(linking_mode) + features.extend(cc_helper.get_coverage_features(ctx, cpp_config)) disabled_features = ctx.disabled_features feature_configuration = cc_common.configure_features( @@ -516,7 +517,6 @@ def cc_binary_impl(ctx, additional_linkopts, force_linkstatic = False): srcs = cc_helper.get_srcs(ctx), module_interfaces = cc_helper.get_cpp_module_interfaces(ctx), compilation_contexts = compilation_context_deps, - code_coverage_enabled = cc_helper.is_code_coverage_enabled(ctx = ctx), ) precompiled_file_objects = cc_common.create_compilation_outputs( objects = depset(precompiled_files[0]), # objects diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl index 0b22987db14de7..eeb2f41048df3a 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl @@ -36,8 +36,6 @@ _UNBOUND = _UnboundValueProviderDoNotUse() _OLD_STARLARK_API_ALLOWLISTED_PACKAGES = [("", "tools/build_defs/cc"), ("_builtins", "")] -_BUILTINS = [("_builtins", "")] - def _check_all_sources_contain_tuples_or_none_of_them(files): no_tuple = False has_tuple = False @@ -652,7 +650,6 @@ def _compile( additional_module_maps = _UNBOUND, propagate_module_map_to_compile_action = _UNBOUND, do_not_generate_module_map = _UNBOUND, - code_coverage_enabled = _UNBOUND, hdrs_checking_mode = _UNBOUND, variables_extension = {}, language = None, @@ -666,7 +663,6 @@ def _compile( additional_exported_hdrs != _UNBOUND or \ propagate_module_map_to_compile_action != _UNBOUND or \ do_not_generate_module_map != _UNBOUND or \ - code_coverage_enabled != _UNBOUND or \ purpose != _UNBOUND or \ hdrs_checking_mode != _UNBOUND or \ implementation_compilation_contexts != _UNBOUND or \ @@ -686,8 +682,6 @@ def _compile( propagate_module_map_to_compile_action = True if do_not_generate_module_map == _UNBOUND: do_not_generate_module_map = False - if code_coverage_enabled == _UNBOUND: - code_coverage_enabled = False if purpose == _UNBOUND: purpose = None if hdrs_checking_mode == _UNBOUND: @@ -743,7 +737,6 @@ def _compile( additional_module_maps = additional_module_maps, propagate_module_map_to_compile_action = propagate_module_map_to_compile_action, do_not_generate_module_map = do_not_generate_module_map, - code_coverage_enabled = code_coverage_enabled, hdrs_checking_mode = hdrs_checking_mode, variables_extension = variables_extension, language = language, diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl index 1c6fc36c9b6f6e..cacf903866dd61 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_helper.bzl @@ -103,16 +103,6 @@ def _merge_cc_debug_contexts(compilation_outputs, dep_cc_infos): return cc_common.merge_debug_context(debug_contexts) -def _is_code_coverage_enabled(ctx): - if ctx.coverage_instrumented(): - return True - if hasattr(ctx.attr, "deps"): - for dep in ctx.attr.deps: - if CcInfo in dep: - if ctx.coverage_instrumented(dep): - return True - return False - def _get_dynamic_libraries_for_runtime(cc_linking_context, linking_statically): libraries = [] for linker_input in cc_linking_context.linker_inputs.to_list(): @@ -1142,10 +1132,42 @@ def _check_cpp_modules(ctx, feature_configuration): ): fail("to use C++ modules, the feature cpp_modules must be enabled") +def _should_instrument_for_coverage(ctx): + if ctx.coverage_instrumented(): + return True + for attr in ["deps", "implementation_deps"]: + for dep in getattr(ctx.attr, attr, []): + if CcInfo in dep and ctx.coverage_instrumented(dep): + return True + return False + +_LEGACY_COVERAGE_FEATURE = "coverage" +_COVERAGE_ENABLED_FEATURE = "coverage_enabled" +_COVERAGE_INSTRUMENTED_FEATURE = "coverage_instrumented" +_LLVM_COVERAGE_MAP_FORMAT_FEATURE = "llvm_coverage_map_format" +_GCC_COVERAGE_MAP_FORMAT_FEATURE = "gcc_coverage_map_format" + +def _get_coverage_features(ctx, cc_config): + if not ctx.configuration.coverage_enabled: + return [] + + coverage_features = [ + _LEGACY_COVERAGE_FEATURE, + _COVERAGE_ENABLED_FEATURE, + ] + if cc_config.use_llvm_coverage_map_format(): + coverage_features.append(_LLVM_COVERAGE_MAP_FORMAT_FEATURE) + else: + coverage_features.append(_GCC_COVERAGE_MAP_FORMAT_FEATURE) + + if _should_instrument_for_coverage(ctx): + coverage_features.append(_COVERAGE_INSTRUMENTED_FEATURE) + + return coverage_features + cc_helper = struct( CPP_TOOLCHAIN_TYPE = _CPP_TOOLCHAIN_TYPE, merge_cc_debug_contexts = _merge_cc_debug_contexts, - is_code_coverage_enabled = _is_code_coverage_enabled, get_dynamic_libraries_for_runtime = _get_dynamic_libraries_for_runtime, get_dynamic_library_for_runtime_or_none = _get_dynamic_library_for_runtime_or_none, find_cpp_toolchain = _find_cpp_toolchain, @@ -1210,4 +1232,5 @@ cc_helper = struct( tokenize = _tokenize, should_use_pic = _should_use_pic, check_cpp_modules = _check_cpp_modules, + get_coverage_features = _get_coverage_features, ) diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl index e4465e6e308a41..ed05819dd9b1be 100755 --- a/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl @@ -29,12 +29,15 @@ def _cc_library_impl(ctx): semantics.check_cc_shared_library_tags(ctx) cc_toolchain = cc_helper.find_cpp_toolchain(ctx) - cc_helper.report_invalid_options(cc_toolchain, ctx.fragments.cpp) + cpp_config = ctx.fragments.cpp + cc_helper.report_invalid_options(cc_toolchain, cpp_config) + features = ctx.features + features.extend(cc_helper.get_coverage_features(ctx, cpp_config)) feature_configuration = cc_common.configure_features( ctx = ctx, cc_toolchain = cc_toolchain, - requested_features = ctx.features, + requested_features = features, unsupported_features = ctx.disabled_features, ) @@ -54,7 +57,7 @@ def _cc_library_impl(ctx): additional_make_variable_substitutions = cc_helper.get_toolchain_global_make_variables(cc_toolchain) additional_make_variable_substitutions.update(cc_helper.get_cc_flags_make_variable(ctx, feature_configuration, cc_toolchain)) - (compilation_context, srcs_compilation_outputs) = cc_common.compile( + compilation_context, srcs_compilation_outputs = cc_common.compile( actions = ctx.actions, name = ctx.label.name, cc_toolchain = cc_toolchain, @@ -71,7 +74,6 @@ def _cc_library_impl(ctx): module_interfaces = cc_helper.get_cpp_module_interfaces(ctx), private_hdrs = cc_helper.get_private_hdrs(ctx), public_hdrs = cc_helper.get_public_hdrs(ctx), - code_coverage_enabled = cc_helper.is_code_coverage_enabled(ctx), compilation_contexts = compilation_contexts, implementation_compilation_contexts = implementation_compilation_contexts, textual_hdrs = ctx.files.textual_hdrs, diff --git a/src/main/starlark/builtins_bzl/common/cc/compile/compile.bzl b/src/main/starlark/builtins_bzl/common/cc/compile/compile.bzl index d7b6ab04a76e0c..b03f0b6211a375 100644 --- a/src/main/starlark/builtins_bzl/common/cc/compile/compile.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/compile/compile.bzl @@ -88,7 +88,6 @@ def compile( additional_module_maps = [], propagate_module_map_to_compile_action = True, do_not_generate_module_map = False, - code_coverage_enabled = False, hdrs_checking_mode = None, # TODO(b/396122076): seems unused; double-check and remove variables_extension = None, language = None, @@ -156,7 +155,6 @@ def compile( additional_module_maps: undocumented propagate_module_map_to_compile_action: undocumented do_not_generate_module_map: undocumented - code_coverage_enabled: undocumented hdrs_checking_mode: undocumented variables_extension: undocumented language: undocumented @@ -320,7 +318,6 @@ def compile( feature_configuration = feature_configuration, generate_no_pic_action = generate_no_pic_action, generate_pic_action = generate_pic_action, - is_code_coverage_enabled = code_coverage_enabled, label = label, private_headers = private_hdrs_artifacts, public_headers = public_hdrs_artifacts, @@ -448,7 +445,6 @@ def _create_cc_compile_actions( feature_configuration, generate_no_pic_action, generate_pic_action, - is_code_coverage_enabled, label, private_headers, public_headers, @@ -568,7 +564,6 @@ def _create_cc_compile_actions( fdo_context = fdo_context, auxiliary_fdo_inputs = auxiliary_fdo_inputs, feature_configuration = feature_configuration, - is_code_coverage_enabled = is_code_coverage_enabled, label = label, common_toolchain_variables = common_compile_build_variables, fdo_build_variables = fdo_build_variables, @@ -633,7 +628,6 @@ def _create_cc_compile_actions( output_category = artifact_category.CLIF_OUTPUT_PROTO if cpp_source.type == CPP_SOURCE_TYPE_CLIF_INPUT_PROTO else artifact_category.OBJECT_FILE, cpp_module_map = cc_compilation_context.module_map(), add_object = True, - enable_coverage = is_code_coverage_enabled, generate_dwo = should_create_per_object_debug_info(feature_configuration, cpp_configuration), bitcode_output = bitcode_output, ) diff --git a/src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl b/src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl index 86aad9dafd55f6..2b7fdd35bb39c8 100644 --- a/src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl @@ -130,6 +130,7 @@ def _build_feature_configuration(common_variables, for_swift_module_map, support enabled_features = [] enabled_features.extend(ctx.features) enabled_features.extend(common_variables.extra_enabled_features) + enabled_features.extend(cc_helper.get_coverage_features(ctx, ctx.fragments.cpp)) disabled_features = [] disabled_features.extend(ctx.disabled_features) @@ -212,7 +213,6 @@ def _compile( propagate_module_map_to_compile_action = True, variables_extension = extension, language = "objc", - code_coverage_enabled = cc_helper.is_code_coverage_enabled(ctx = common_variables.ctx), hdrs_checking_mode = "strict", do_not_generate_module_map = not generate_module_map or module_map.file().is_source, purpose = purpose, diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelperTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelperTest.java index 3b93ccee5f5265..b7282fae3fbb11 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelperTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelperTest.java @@ -127,12 +127,4 @@ public void testCanConsumeObjcSource() throws Exception { assertThat(Artifact.toRootRelativePaths(helperArtifacts.build())) .contains(objcSrc.getRootRelativePath().toString()); } - - @Test - public void testSetAllowCodeCoverage() throws Exception { - useConfiguration("--collect_code_coverage", "--instrumentation_filter=."); - ConfiguredTarget target = - scratchConfiguredTarget("a", "b", "cc_library(name = 'b', srcs = ['cpp.cc'])"); - assertThat(CcCompilationHelper.isCodeCoverageEnabled(getRuleContext(target))).isTrue(); - } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java index d1321c5c97ed2c..977fd41b51530d 100755 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java @@ -7471,7 +7471,6 @@ def _impl(ctx): compileCall + "additional_exported_hdrs = [])", compileCall + "propagate_module_map_to_compile_action = True)", compileCall + "do_not_generate_module_map = True)", - compileCall + "code_coverage_enabled = True)", compileCall + "separate_module_headers = [])", compileCall + "hdrs_checking_mode = 'strict')"); scratch.overwriteFile(