From 26ced97acf651e85626de445038d8252efb40e86 Mon Sep 17 00:00:00 2001 From: Ted Pudlik Date: Fri, 7 Apr 2023 23:59:57 +0000 Subject: [PATCH] pw_crypto: Bazel file cleanup * Remove some unnecessary `tags = ["manual"]` attributes (the affected targets now build, so there's no reason to exclude them). * Simplify the third_party/mbedtls/BUILD.bazel file. This will make it easier for users to parse, but also easier for our copybara automation to handle. Change-Id: I047cde9d6de257a40dd6a8e2fa4b65228011694f Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/137792 Reviewed-by: Ali Zhang Commit-Queue: Auto-Submit Pigweed-Auto-Submit: Ted Pudlik --- pw_crypto/BUILD.bazel | 3 --- third_party/mbedtls/BUILD.bazel | 26 +++++++++----------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/pw_crypto/BUILD.bazel b/pw_crypto/BUILD.bazel index 998df0000c..0ec80e9829 100644 --- a/pw_crypto/BUILD.bazel +++ b/pw_crypto/BUILD.bazel @@ -77,7 +77,6 @@ pw_cc_library( "public_overrides/mbedtls/pw_crypto/sha256_backend.h", ], includes = ["public_overrides/mbedtls"], - tags = ["manual"], deps = [ ":sha256_facade", "@mbedtls", @@ -128,8 +127,6 @@ pw_cc_library( pw_cc_test( name = "sha256_mock_test", srcs = ["sha256_mock_test.cc"], - # TODO(b/236321905): Requires BUILD.bazel files for mbedtls - tags = ["manual"], deps = [ ":sha256_mock", "//pw_unit_test", diff --git a/third_party/mbedtls/BUILD.bazel b/third_party/mbedtls/BUILD.bazel index 9624fc8713..55c9d0af5b 100644 --- a/third_party/mbedtls/BUILD.bazel +++ b/third_party/mbedtls/BUILD.bazel @@ -21,21 +21,13 @@ package( default_visibility = ["//visibility:public"], ) -# Ready-made configurations -mbedtls_configs = [ - ("default", "configs/config_default.h"), -] - # Config targets. -[ - pw_cc_library( - name = "%s_config" % config_name, - hdrs = [ - config_header, - "configs/config_pigweed_common.h", - ], - defines = ['MBEDTLS_CONFIG_FILE=\\"%s\\"' % config_header], - includes = ["."], - ) - for config_name, config_header in mbedtls_configs -] +pw_cc_library( + name = "default_config", + hdrs = [ + "configs/config_default.h", + "configs/config_pigweed_common.h", + ], + defines = ['MBEDTLS_CONFIG_FILE=\\"configs/config_default.h\\"'], + includes = ["."], +)