diff options
| author | Martin Stjernholm <mast@google.com> | 2021-08-26 21:34:52 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-09-06 12:26:41 +0000 |
| commit | 0cbb59743f103ac2ad9ed9642f221a814dffb0ac (patch) | |
| tree | 54931ba76a78c53ab391b309ea44b826ab297be7 | |
| parent | 8992f92aab381f0dc85cfd4003d935263f8451c8 (diff) | |
Allow visibility on libdexfile for all libdexfile_support users.
Also add a note that libdexfile_support users also need to depend on
libdexfile.
Manual cherry-pick from https://r.android.com/1810837.
Ignore-AOSP-First: Cherry-picked from AOSP
Test: m droid
Bug: 197856821
Bug: 169779783
Change-Id: I80162942a6557b0309ccde28c058cdf66c1fa250
Merged-In: I80162942a6557b0309ccde28c058cdf66c1fa250
| -rw-r--r-- | libdexfile/Android.bp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp index 31cf19711d..47f2e29a58 100644 --- a/libdexfile/Android.bp +++ b/libdexfile/Android.bp @@ -162,6 +162,15 @@ gensrcs { art_cc_library { name: "libdexfile", + visibility: [ + // Allow libdexfile_support users to list this as a runtime_libs + // dependency - see comment for libdexfile_support. It shouldn't be used + // for any other purpose. + "//external/perfetto", + "//system/core/debuggerd", + "//system/extras/simpleperf", + "//system/unwinding/libunwindstack", + ], defaults: [ "libdexfile_defaults", "libart_nativeunwind_defaults", @@ -369,6 +378,14 @@ art_cc_test { // dependency on dex file logic. It is therefore safe to use from binaries // compiled without dex file support, given they won't encounter any dex file // stack frames. +// +// IMPORTANT: When adding a static_libs dependency on this library, please +// remember to also add a corresponding +// +// runtime_libs: ["libdexfile"], +// +// That is necessary since Soong doesn't propagate dependencies transitively for +// static libraries (b/169779783). art_cc_library_static { name: "libdexfile_support", visibility: ["//visibility:public"], |