fuchsia-china/third_party.pigweed.src
1
0
Fork 0
mirror of https://fuchsia.googlesource.com/third_party/pigweed.googlesource.com/pigweed/pigweed synced 2024-07-12 01:23:34 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

pw_preprocessor: Define as cc_static_library

Browse Source 
- Define non-facade libraries as cc_static_library so they can be built
  on their own, following the new guidance at:
  https://pigweed.dev/pw_build_android/.
- Fix affected modules.

Bug: 328503970
Test: presubmits in Android main pass
Change-Id: I851e9a27647f54c6c7f02f43a313a914e0a53bed
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/199031
Reviewed-by: Cindy Liu <hcindyl@google.com>
Pigweed-Auto-Submit: Carlos Chinchilla <cachinchilla@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Reviewed-by: Matthew Sedam <matthewsedam@google.com>
This commit is contained in:
Carlos Chinchilla 2024-03-26 22:48:22 +00:00 committed by CQ Bot Account
parent 04fbfa3825
commit d99ef2cf38
21 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pw_assert_log/Android.bp
View File

@ -29,17 +29,19 @@ cc_library_static {
header_libs: [
"pw_assert",
"pw_log",
"pw_preprocessor",
],
export_header_lib_headers: [
"pw_assert",
"pw_log",
"pw_preprocessor",
],
whole_static_libs: [
// Explicitly depend on the pw_log_android since pw_assert_log is a part
// of pw_android_common_backends.
"pw_log_android",
"pw_preprocessor",
],
export_static_lib_headers: [
"pw_preprocessor",
],
srcs: [
"assert_log.cc",

2
pw_base64/Android.bp
View File

@ -24,7 +24,6 @@ cc_library_static {
header_libs: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_span",
],
defaults: [
@ -38,6 +37,7 @@ cc_library_static {
"base64.cc",
],
static_libs: [
"pw_preprocessor",
"pw_string",
],
export_static_lib_headers: [

2
pw_bytes/Android.bp
View File

@ -23,7 +23,6 @@ cc_library_static {
export_include_dirs: ["public"],
header_libs: [
"fuchsia_sdk_lib_stdcompat",
"pw_preprocessor",
"pw_span",
],
export_header_lib_headers: [
@ -40,6 +39,7 @@ cc_library_static {
static_libs: [
"pw_containers",
"pw_polyfill",
"pw_preprocessor",
"pw_status",
],
}

4
pw_chrono/Android.bp
View File

@ -24,10 +24,10 @@ cc_library_headers {
],
vendor_available: true,
host_supported: true,
header_libs: [
static_libs: [
"pw_preprocessor",
],
export_header_lib_headers: [
export_static_lib_headers: [
"pw_preprocessor",
],
}

2
pw_containers/Android.bp
View File

@ -27,9 +27,9 @@ cc_library_static {
header_libs: [
"pw_assert",
"pw_log",
"pw_preprocessor",
],
static_libs: [
"pw_preprocessor",
"pw_polyfill",
],
host_supported: true,

2
pw_hdlc/Android.bp
View File

@ -26,7 +26,6 @@ cc_library {
header_libs: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
],
@ -39,6 +38,7 @@ cc_library {
static_libs: [
"pw_bytes",
"pw_checksum",
"pw_preprocessor",
"pw_status",
"pw_stream",
"pw_varint",

4
pw_log_null/Android.bp
View File

@ -25,10 +25,10 @@ cc_library_static {
"public_overrides",
],
host_supported: true,
header_libs: [
static_libs: [
"pw_preprocessor",
],
export_header_lib_headers: [
export_static_lib_headers: [
"pw_preprocessor",
],
}

4
pw_metric/Android.bp
View File

@ -27,23 +27,23 @@ cc_library {
"pw_assert",
"pw_log",
"pw_span",
"pw_preprocessor",
],
export_header_lib_headers: [
"pw_assert",
"pw_log",
"pw_span",
"pw_preprocessor",
],
static_libs: [
"pw_base64",
"pw_containers",
"pw_preprocessor",
"pw_tokenizer",
"pw_tokenizer_base64",
],
export_static_lib_headers: [
"pw_base64",
"pw_containers",
"pw_preprocessor",
"pw_tokenizer",
"pw_tokenizer_base64",
],

2
pw_preprocessor/Android.bp
View File

@ -16,7 +16,7 @@ package {
default_applicable_licenses: ["external_pigweed_license"],
}
cc_library_headers {
cc_library_static {
name: "pw_preprocessor",
cpp_std: "c++20",
vendor_available: true,

4
pw_protobuf/Android.bp
View File

@ -29,7 +29,6 @@ cc_library_static {
"fuchsia_sdk_lib_stdcompat",
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
"pw_toolchain",
@ -37,7 +36,6 @@ cc_library_static {
export_header_lib_headers: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
],
@ -55,6 +53,7 @@ cc_library_static {
"pw_containers",
"pw_function",
"pw_polyfill",
"pw_preprocessor",
"pw_status",
"pw_stream",
"pw_string",
@ -64,6 +63,7 @@ cc_library_static {
"pw_bytes",
"pw_containers",
"pw_function",
"pw_preprocessor",
"pw_status",
"pw_stream",
"pw_varint",

8
pw_result/Android.bp
View File

@ -25,15 +25,11 @@ cc_library_headers {
"public",
],
static_libs: [
"pw_preprocessor",
"pw_status",
],
export_static_lib_headers: [
"pw_preprocessor",
"pw_status",
],
header_libs: [
"pw_preprocessor",
],
export_header_lib_headers: [
"pw_preprocessor",
],
}

4
pw_rpc/Android.bp
View File

@ -115,7 +115,6 @@ cc_defaults {
"fuchsia_sdk_lib_stdcompat",
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_rpc_include_dirs",
"pw_span",
@ -127,7 +126,6 @@ cc_defaults {
"fuchsia_sdk_lib_stdcompat",
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_rpc_include_dirs",
"pw_span",
@ -139,6 +137,7 @@ cc_defaults {
"pw_containers",
"pw_function",
"pw_polyfill",
"pw_preprocessor",
"pw_protobuf",
"pw_status",
"pw_stream",
@ -151,6 +150,7 @@ cc_defaults {
"pw_containers",
"pw_function",
"pw_polyfill",
"pw_preprocessor",
"pw_protobuf",
"pw_status",
"pw_stream",

4
pw_rpc_transport/Android.bp
View File

@ -44,7 +44,6 @@ cc_library_static {
],
header_libs: [
"pw_log",
"pw_preprocessor",
"pw_result",
],
export_header_lib_headers: [
@ -54,6 +53,7 @@ cc_library_static {
static_libs: [
"pw_containers",
"pw_polyfill",
"pw_preprocessor",
"pw_rpc_transport_rpc_transport",
],
export_static_lib_headers: [
@ -76,7 +76,6 @@ cc_library_static {
header_libs: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
],
@ -88,6 +87,7 @@ cc_library_static {
],
static_libs: [
"pw_polyfill",
"pw_preprocessor",
"pw_rpc_transport_rpc_transport",
],
export_static_lib_headers: [

4
pw_spi/Android.bp
View File

@ -33,7 +33,6 @@ cc_library_static {
"pw_assert",
"pw_chrono",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
"pw_sync",
@ -41,18 +40,19 @@ cc_library_static {
export_header_lib_headers: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
"pw_sync",
],
static_libs: [
"pw_bytes",
"pw_preprocessor",
"pw_status",
"pw_sync.binary_semaphore_thread_notification",
],
export_static_lib_headers: [
"pw_bytes",
"pw_preprocessor",
"pw_status",
],
}

8
pw_stream/Android.bp
View File

@ -27,7 +27,6 @@ cc_library_static {
export_header_lib_headers: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
"pw_toolchain",
@ -35,7 +34,6 @@ cc_library_static {
header_libs: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
"pw_toolchain",
@ -47,10 +45,12 @@ cc_library_static {
static_libs: [
"pw_bytes",
"pw_polyfill",
"pw_preprocessor",
"pw_status",
],
export_static_lib_headers: [
"pw_polyfill",
"pw_preprocessor",
],
}
@ -65,7 +65,6 @@ cc_library_static {
export_header_lib_headers: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
"pw_toolchain",
@ -73,7 +72,6 @@ cc_library_static {
header_libs: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
"pw_toolchain",
@ -84,11 +82,13 @@ cc_library_static {
static_libs: [
"pw_bytes",
"pw_polyfill",
"pw_preprocessor",
"pw_status",
"pw_stream",
],
export_static_lib_headers: [
"pw_polyfill",
"pw_preprocessor",
"pw_stream",
],
}

4
pw_stream_uart_linux/Android.bp
View File

@ -24,7 +24,6 @@ cc_library_static {
header_libs: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
"pw_toolchain",
@ -32,7 +31,6 @@ cc_library_static {
export_header_lib_headers: [
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
],
@ -41,12 +39,14 @@ cc_library_static {
],
static_libs: [
"pw_bytes",
"pw_preprocessor",
"pw_polyfill",
"pw_status",
"pw_stream",
],
export_static_lib_headers: [
"pw_bytes",
"pw_preprocessor",
"pw_status",
"pw_stream",
],

2
pw_string/Android.bp
View File

@ -28,7 +28,6 @@ cc_library_static {
"fuchsia_sdk_lib_stdcompat",
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
],
@ -48,6 +47,7 @@ cc_library_static {
],
static_libs: [
"pw_polyfill",
"pw_preprocessor",
"pw_status",
],
}

4
pw_sync/Android.bp
View File

@ -24,17 +24,17 @@ cc_library_headers {
host_supported: true,
header_libs: [
"pw_chrono",
"pw_preprocessor",
],
export_header_lib_headers: [
"pw_chrono",
"pw_preprocessor",
],
static_libs: [
"pw_polyfill",
"pw_preprocessor",
],
export_static_lib_headers: [
"pw_polyfill",
"pw_preprocessor",
],
}

2
pw_thread/Android.bp
View File

@ -26,7 +26,6 @@ cc_defaults {
header_libs: [
"pw_chrono",
"pw_thread_include_dirs",
"pw_preprocessor",
],
export_header_lib_headers: [
"pw_chrono",
@ -34,6 +33,7 @@ cc_defaults {
],
static_libs: [
"pw_function",
"pw_preprocessor",
"pw_status",
],
srcs: [

12
pw_tokenizer/Android.bp
View File

@ -30,7 +30,6 @@ cc_library_static {
"pw_assert",
"pw_log",
"pw_log_tokenized",
"pw_preprocessor",
"pw_result",
"pw_span",
],
@ -38,7 +37,6 @@ cc_library_static {
"fuchsia_sdk_lib_stdcompat",
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
],
@ -52,6 +50,7 @@ cc_library_static {
"pw_bytes",
"pw_containers",
"pw_polyfill",
"pw_preprocessor",
"pw_varint",
],
export_static_lib_headers: [
@ -59,6 +58,7 @@ cc_library_static {
"pw_bytes",
"pw_containers",
"pw_polyfill",
"pw_preprocessor",
"pw_varint",
],
}
@ -81,24 +81,24 @@ cc_library_static {
"pw_assert",
"pw_log",
"pw_log_tokenized",
"pw_preprocessor",
"pw_span",
],
export_header_lib_headers: [
"pw_assert",
"pw_log",
"pw_log_tokenized",
"pw_preprocessor",
"pw_span",
],
static_libs: [
"pw_containers",
"pw_polyfill",
"pw_preprocessor",
"pw_varint",
],
export_static_lib_headers: [
"pw_containers",
"pw_polyfill",
"pw_preprocessor",
"pw_varint",
],
}
@ -113,22 +113,22 @@ cc_library_static {
"base64.cc",
],
header_libs: [
"pw_preprocessor",
"pw_span",
],
export_header_lib_headers: [
"pw_preprocessor",
"pw_span",
],
static_libs: [
"pw_base64",
"pw_containers",
"pw_preprocessor",
"pw_string",
"pw_tokenizer",
],
export_static_lib_headers: [
"pw_base64",
"pw_containers",
"pw_preprocessor",
"pw_string",
"pw_tokenizer",
],

2
pw_varint/Android.bp
View File

@ -29,7 +29,6 @@ cc_library_static {
"fuchsia_sdk_lib_stdcompat",
"pw_assert",
"pw_log",
"pw_preprocessor",
"pw_result",
"pw_span",
],
@ -39,6 +38,7 @@ cc_library_static {
whole_static_libs: [
"pw_bytes",
"pw_polyfill",
"pw_preprocessor",
"pw_status",
"pw_stream",
],