Switch to wildcards for GN friend statements
Make existing GN friend statments use the ":*" wildcard to make all
targets in the module friends. This makes the friend relationship
broader than needed, but allows it to work when unit test executables
expand to multiple targets.
Change-Id: I89ed58709e3f736c20fcca2cc470a3a4387e6775
diff --git a/pw_kvs/BUILD.gn b/pw_kvs/BUILD.gn
index bc5351a..0f38b2b 100644
--- a/pw_kvs/BUILD.gn
+++ b/pw_kvs/BUILD.gn
@@ -46,7 +46,6 @@
"pw_kvs_private/macros.h",
"sectors.cc",
]
- sources += public
public_deps = [
dir_pw_containers,
dir_pw_span,
@@ -56,19 +55,11 @@
dir_pw_checksum,
dir_pw_log,
]
- friend = [
- ":entry_test",
- ":entry_cache_test",
- ":key_value_store_test",
- ":key_value_store_binary_format_test",
- ":key_value_store_map_test",
- ":sectors_test",
- ]
+ friend = [ ":*" ]
}
source_set("crc16") {
public = [ "public/pw_kvs/crc16_checksum.h" ]
- sources = public
public_deps = [
":pw_kvs",
dir_pw_checksum,
@@ -81,7 +72,7 @@
"public/pw_kvs/in_memory_fake_flash.h",
"pw_kvs_private/byte_utils.h",
]
- sources = [ "in_memory_fake_flash.cc" ] + public
+ sources = [ "in_memory_fake_flash.cc" ]
visibility = [ ":*" ]
public_deps = [
dir_pw_kvs,
@@ -92,7 +83,7 @@
source_set("test_partition") {
public_configs = [ ":default_config" ]
public = [ "public/pw_kvs/flash_partition_with_stats.h" ]
- sources = [ "flash_partition_with_stats.cc" ] + public
+ sources = [ "flash_partition_with_stats.cc" ]
visibility = [ ":*" ]
public_deps = [
dir_pw_kvs,
diff --git a/pw_tokenizer/BUILD.gn b/pw_tokenizer/BUILD.gn
index b4663ff..619e760 100644
--- a/pw_tokenizer/BUILD.gn
+++ b/pw_tokenizer/BUILD.gn
@@ -42,17 +42,13 @@
"public/pw_tokenizer/internal/tokenize_string.h",
"tokenize.cc",
]
- sources += public
- friend = [
- ":argument_types_test",
- ":hash_test",
- ]
+ friend = [ ":*" ]
}
source_set("base64") {
public_configs = [ ":default_config" ]
public = [ "public/pw_tokenizer/base64.h" ]
- sources = [ "base64.cc" ] + public
+ sources = [ "base64.cc" ]
public_deps = [
"$dir_pw_preprocessor",
"$dir_pw_span",
@@ -74,11 +70,7 @@
"public/pw_tokenizer/internal/decode.h",
"token_database.cc",
]
- sources += public
- friend = [
- ":decode_test",
- ":generate_decoding_test_data",
- ]
+ friend = [ ":*" ]
}
# Executable for generating test data for the C++ and Python detokenizers. This