From fb60e6c9aed973759e1fbd66a1dfbfc5b7cdaef6 Mon Sep 17 00:00:00 2001
From: Victor Khimenko <khim@google.com>
Date: Thu, 18 Jun 2020 22:01:13 +0200
Subject: [PATCH] Make libbacktrace buildable for native_bridge

Bug: http://b/153609531

Test: m -j64 libbacktrace.native_bridge

Change-Id: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406
Merged-In: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406
---
 libbacktrace/Android.bp   | 5 +++++
 libprocinfo/Android.bp    | 2 ++
 libunwindstack/Android.bp | 7 +++++++
 libutils/Android.bp       | 2 ++
 4 files changed, 16 insertions(+)

diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index c4cfa6fbe..c9e45124a 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -96,6 +96,8 @@ cc_defaults {
 cc_library {
     name: "libbacktrace",
     vendor_available: false,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     recovery_available: true,
     apex_available: [
         "//apex_available:platform",
@@ -120,6 +122,9 @@ cc_library {
         recovery: {
             cflags: ["-DNO_LIBDEXFILE_SUPPORT"],
         },
+        native_bridge: {
+            cflags: ["-DNO_LIBDEXFILE_SUPPORT"],
+        },
     },
 }
 
diff --git a/libprocinfo/Android.bp b/libprocinfo/Android.bp
index 15b0d89d8..ae4574276 100644
--- a/libprocinfo/Android.bp
+++ b/libprocinfo/Android.bp
@@ -27,6 +27,8 @@ cc_library {
     name: "libprocinfo",
     defaults: ["libprocinfo_defaults"],
     vendor_available: true,
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
     recovery_available: true,
     vndk: {
         enabled: true,
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index 563c2c296..9b974c237 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -113,6 +113,8 @@ cc_library {
     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,
@@ -134,6 +136,11 @@ cc_library {
             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: [
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 3a30a9e77..85f428067 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -175,6 +175,8 @@ cc_library {
 cc_library {
     name: "libutilscallstack",
     defaults: ["libutils_defaults"],
+    // TODO(b/153609531): remove when no longer needed.
+    native_bridge_supported: true,
 
     srcs: [
         "CallStack.cpp",