[build] Allow //third_party/tink-cc/* in visibility list Update visibility allowlists to permit //third_party/tink-cc/*, supporting the migration of Cobalt to standalone tink-cc. Bug: 524729018 TAG: agy CONV: 90202eb4-61f5-41b3-b833-bd1359a46a91 Change-Id: Ifa8f9b9e3feb4d347641145d46d5676953e8bb52 Reviewed-on: https://fuchsia-review.googlesource.com/c/protobuf-gn/+/1687488 Reviewed-by: Steve Fung <stevefung@google.com>
diff --git a/BUILD.gn b/BUILD.gn index b7ac552..d42d1da 100644 --- a/BUILD.gn +++ b/BUILD.gn
@@ -63,6 +63,7 @@ "//third_party/perfetto/*", "//third_party/spirv-tools:*", "//third_party/tink/*", + "//third_party/tink-cc/*", "//tools/fidlcat/*", "//vendor/third_party/*", ] @@ -87,6 +88,7 @@ "//third_party/pigweed/src/pw_protobuf:*", "//third_party/pigweed/src/pw_tokenizer:*", "//third_party/tink/cc/proto:*", + "//third_party/tink-cc/*", "//tools/bazel-docgen:*", "//tools/build/fx-set:*", "//tools/debug/covargs/*",
diff --git a/BUILD.input.gn b/BUILD.input.gn index 0b21bf5..753ddce 100644 --- a/BUILD.input.gn +++ b/BUILD.input.gn
@@ -26,10 +26,10 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import("//build/test.gni") -import("//third_party/protobuf/proto_library.gni") import("//build/config/protobuf.gni") import("//build/licenses/license.gni") +import("//build/test.gni") +import("//third_party/protobuf/proto_library.gni") license("protobuf_license") { public_package_name = "protobuf" @@ -59,6 +59,7 @@ "//third_party/perfetto/*", "//third_party/spirv-tools:*", "//third_party/tink/*", + "//third_party/tink-cc/*", "//tools/fidlcat/*", "//vendor/third_party/*", ] @@ -83,6 +84,7 @@ "//third_party/pigweed/src/pw_protobuf:*", "//third_party/pigweed/src/pw_tokenizer:*", "//third_party/tink/cc/proto:*", + "//third_party/tink-cc/*", "//tools/bazel-docgen:*", "//tools/build/fx-set:*", "//tools/debug/covargs/*", @@ -296,7 +298,9 @@ if (current_toolchain == host_toolchain) { # Only the minimal upb files required to build the protoc compiler. # - # git ls-files -- ':!*_test.cc' 'upb/port/*.h' 'upb/port/*.inc' 'upb/port/*.cc' 'upb/base/*.h' 'upb/base/*.cc' 'upb/mem/*.h' 'upb/mem/*.cc' | sed 's/^/"/' | sed 's/$/",/' + # git ls-files -- ':!*_test.cc' 'upb/port/*.h' 'upb/port/*.inc' + # 'upb/port/*.cc' 'upb/base/*.h' 'upb/base/*.cc' 'upb/mem/*.h' 'upb/mem/*.cc' + # | sed 's/^/"/' | sed 's/$/",/' static_library("upb") { if (use_new_protobuf) { sources = [ UPB_LIB_SOURCES_V35 ] @@ -316,7 +320,9 @@ # support protoc plugins that need to link libprotoc, but not the main() # itself. See src/google/protobuf/compiler/plugin.h # - # git ls-files -- ':!*/main.cc' ':!*test*' ':!*mock*' ':!src/google/protobuf/compiler/cpp/tools/*' 'src/google/protobuf/compiler/*.cc' | sed 's/^/"/' | sed 's/$/",/' + # git ls-files -- ':!*/main.cc' ':!*test*' ':!*mock*' + # ':!src/google/protobuf/compiler/cpp/tools/*' + # 'src/google/protobuf/compiler/*.cc' | sed 's/^/"/' | sed 's/$/",/' static_library("protoc_lib") { visibility += [ "//third_party/grpc:*",