diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-17 04:38:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-17 04:38:31 +0000 |
commit | ac8312bc58265afbe2b9a366b44c922410e74662 (patch) | |
tree | c74c991790ea2b7ca6707ac8851cbe523a42dd0e | |
parent | 08cb810a8349598942d71066d11ca5351e3523f8 (diff) | |
parent | d21a8afcacf844bf99e6d35be10ed863530dd1c8 (diff) | |
download | avb-ac8312bc58265afbe2b9a366b44c922410e74662.tar.gz |
Snap for 9617930 from b81c0b2182daef6fbcbd33d5cf7d9045d697b939 to udc-release am: d21a8afcac
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/avb/+/21471971
Change-Id: Ibe0bfa888b5650abfbcec21d9530b91bb79d228b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 44 |
1 files changed, 25 insertions, 19 deletions
@@ -114,9 +114,6 @@ cc_defaults { local_include_dirs: [ "libavb/boringssl", ], - shared_libs: [ - "libcrypto", - ], } cc_defaults { @@ -155,14 +152,24 @@ cc_defaults { "avb_sources", "avb_crypto_ops_impl_boringssl", ], + header_libs: [ + "avb_headers", + ], + export_header_lib_headers: ["avb_headers"], +} + +// Build libavb - this is a static library that depends +// on only libc and libcrypto, but no other dependencies. +cc_library_static { + name: "libavb", + defaults: ["libavb_defaults"], host_supported: true, ramdisk_available: true, vendor_ramdisk_available: true, recovery_available: true, - header_libs: [ - "avb_headers", + shared_libs: [ + "libcrypto", ], - export_header_lib_headers: ["avb_headers"], target: { linux: { srcs: ["libavb/avb_sysdeps_posix.c"], @@ -173,21 +180,17 @@ cc_defaults { }, } -// Build libavb - this is a static library that depends -// on only libc and libcrypto, but no other dependencies. -cc_library_static { - name: "libavb", - defaults: ["libavb_defaults"], -} - -// Build libavb_non_debug - this is a static library that depends -// on only libc and libcrypto, but no other dependencies. -// The non debug version of the library doesn't print any debug -// message. +// A variant of the library that can run in baremetal environments. +// +// The debug feature isn't enabled, removing verbose logging and assertions. cc_library_static { - name: "libavb_non_debug", + name: "libavb_baremetal", defaults: ["libavb_defaults"], cflags: ["-UAVB_ENABLE_DEBUG"], + static_libs: [ + "libcrypto_baremetal", + ], + srcs: ["libavb/avb_sysdeps_posix.c"], } // Build libavb_user for the target - in addition to libavb, it @@ -205,7 +208,10 @@ cc_library_static { "avb_headers", ], export_header_lib_headers: ["avb_headers"], - shared_libs: ["libbase"], + shared_libs: [ + "libbase", + "libcrypto", + ], static_libs: ["libfs_mgr"], cflags: [ "-DAVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED", |