commit 7428c52ef265fbe7477261c0df629b9a8895794e
author Victor Khimenko <khim@google.com> Thu Jun 18 22:01:13 2020 +0200
committer Victor Khimenko <khim@google.com> Thu Jun 18 22:02:46 2020 +0200
tree 68df64136d84d21bc75c683f9da330ab2e5c1b7e
parent cec2d69a0b4fa80e8c3b582a2bf3caac9c29057b

Make libbacktrace buildable for native_bridge

Bug: http://b/153609531

Test: m -j64 libbacktrace.native_bridge

Change-Id: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406

libunwindstack/Android.bp

diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 3c44534..19c22c8 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -124,6 +124,8 @@
     name: "libunwindstack",
     vendor_available: true,
     recovery_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     vndk: {
         enabled: true,
         support_system_process: true,
@@ -145,6 +147,11 @@
             exclude_srcs: ["DexFile.cpp"],
             exclude_shared_libs: ["libdexfile_support"],
         },
+        native_bridge: {
+            cflags: ["-UDEXFILE_SUPPORT"],
+            exclude_srcs: ["DexFile.cpp"],
+            exclude_shared_libs: ["libdexfile_support"],
+        },
     },
 
     apex_available: [