diff options
| author | Victor Khimenko <khim@google.com> | 2020-06-18 22:01:13 +0200 |
|---|---|---|
| committer | Victor Khimenko <khim@google.com> | 2020-07-10 20:13:23 +0200 |
| commit | 46a6318c56449e1148ea65611de9c8e4ef9b8e40 (patch) | |
| tree | 91d38cf5ca0c646fbd71b010176d1891c28a9cda | |
| parent | c931a9bd2e12f59c1118cf2ee2c20e1770b08948 (diff) | |
| download | unwinding-android11-tests-dev.tar.gz | |
Make libbacktrace buildable for native_bridgeandroid11-tests-releaseandroid11-tests-devandroid11-dev
Bug: http://b/153609531
Test: m -j64 libbacktrace.native_bridge
Change-Id: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406
Merged-In: I2b8a881b4e952f3b68dbcaeb14f147a6d955b406
| -rw-r--r-- | libbacktrace/Android.bp | 5 | ||||
| -rw-r--r-- | libunwindstack/Android.bp | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp index c4cfa6f..c9e4512 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/libunwindstack/Android.bp b/libunwindstack/Android.bp index 563c2c2..9b974c2 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: [ |