diff options
| author | Andrew Scull <ascull@google.com> | 2022-01-12 19:01:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-12 19:01:51 +0000 |
| commit | 0f954b4913ba5a50a5247ae9e92f0b155eb81597 (patch) | |
| tree | c310a17a7e54566eeae758ae6f60abe20f81a89a | |
| parent | 30989efa4da5be11a977569d9160fbd8f2e99329 (diff) | |
| parent | d717f692000298dc16da1dfd12198b762a99f58d (diff) | |
| download | avb-0f954b4913ba5a50a5247ae9e92f0b155eb81597.tar.gz | |
Fix test build rules for different SHA implementations am: 2787f22497 am: ff986c9104 am: d717f69200
Original change: https://android-review.googlesource.com/c/platform/external/avb/+/1944986
Change-Id: If0de4283297950ab53d6255f44ba8f00a3bc5395
| -rw-r--r-- | Android.bp | 40 |
1 files changed, 12 insertions, 28 deletions
@@ -147,7 +147,8 @@ python_binary_host { compile_multilib: "first", } -// on only libc and doesn't drag in any other dependencies. +// Build libavb - this is a static library that depends +// on only libc and libcrypto, but no other dependencies. cc_library_static { name: "libavb", defaults: [ @@ -230,19 +231,8 @@ cc_library_host_static { srcs: ["libavb_ab/avb_ab_flow.c"], } -cc_library_host_static { - name: "libavb_atx_host", - defaults: [ - "avb_defaults", - "avb_crypto_ops_impl_boringssl", - ], - header_libs: [ - "avb_headers", - ], - export_header_lib_headers: ["avb_headers"], - cflags: [ - "-fno-stack-protector", - ], +cc_defaults { + name: "avb_atx_sources", srcs: ["libavb_atx/avb_atx_validate.c"], } @@ -256,22 +246,19 @@ cc_library_host_static { srcs: ["libavb/avb_sysdeps_posix.c"], } -cc_library_host_static { - name: "libavb_things_example", - defaults: [ - "avb_defaults", - "avb_crypto_ops_impl_boringssl", - ], - header_libs: [ - "avb_headers", - ], - export_header_lib_headers: ["avb_headers"], +cc_defaults { + name: "avb_things_example_sources", srcs: ["examples/things/avb_atx_slot_verify.c"], } cc_defaults { name: "libavb_host_unittest_core", - defaults: ["avb_defaults"], + defaults: [ + "avb_defaults", + "avb_sources", + "avb_atx_sources", + "avb_things_example_sources", + ], required: [ "simg2img", "img2simg", @@ -290,10 +277,7 @@ cc_defaults { test_config: "test/libavb_host_unittest.xml", test_suites: ["general-tests"], static_libs: [ - "libavb", "libavb_ab_host", - "libavb_atx_host", - "libavb_things_example", "libgmock_host", "libgtest_host", ], |