Snap for 7708222 from 0cbb59743f103ac2ad9ed9642f221a814dffb0ac to sc-qpr1-release

Change-Id: I11e107ff8b1ad17d3c2bf88944c83c569469ab8d

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"],