diff options
| author | Anthony Stange <stange@google.com> | 2022-04-01 18:13:48 +0000 |
|---|---|---|
| committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-01 18:58:54 +0000 |
| commit | a74c04985a4d1329aba3443a537d2c794d2b2e12 (patch) | |
| tree | 0341b730dd2b2a0cdf13e0528d194398fe3f046e | |
| parent | eba38dc0801b3f09ac642a3c2a5712d5f869c744 (diff) | |
| download | pigweed-a74c04985a4d1329aba3443a537d2c794d2b2e12.tar.gz | |
Add and fix pw_log/pw_log_android Android.bp targets
Fixes Android breakage by defining libpw_log for use by Android targets
and ensuring cc_library is used so that srcs can be defined for pw_log.
Change-Id: I4e5617a5b25482dfee00e0159490084b1fb6e5b6
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/89502
Reviewed-by: Keir Mierle <keir@google.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>
Commit-Queue: Anthony Stange <stange@google.com>
| -rw-r--r-- | pw_log/Android.bp | 25 | ||||
| -rw-r--r-- | pw_log_android/Android.bp | 6 |
2 files changed, 28 insertions, 3 deletions
diff --git a/pw_log/Android.bp b/pw_log/Android.bp new file mode 100644 index 000000000..cc642b20c --- /dev/null +++ b/pw_log/Android.bp @@ -0,0 +1,25 @@ +// Copyright 2022 The Pigweed Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy of +// the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. + +cc_library { + name: "libpw_log", + vendor_available: true, + cpp_std: "c++2a", + srcs: [ + "proto_utils.cc", + ], + export_include_dirs: [ + "public", + ], +}
\ No newline at end of file diff --git a/pw_log_android/Android.bp b/pw_log_android/Android.bp index f377925a6..179249e1a 100644 --- a/pw_log_android/Android.bp +++ b/pw_log_android/Android.bp @@ -12,7 +12,7 @@ // License for the specific language governing permissions and limitations under // the License. -cc_library_headers { +cc_library { name: "libpw_log_android", vendor_available: true, cpp_std: "c++2a", @@ -20,10 +20,10 @@ cc_library_headers { "public", "public_overrides", ], - header_libs: [ + export_static_lib_headers: [ "libpw_log", ], - export_header_lib_headers: [ + static_libs: [ "libpw_log", ], } |