Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3f15d28 authored by Victor Khimenko's avatar Victor Khimenko Committed by Automerger Merge Worker
Browse files

Merge "Make libbacktrace buildable for native_bridge" am: a2f97dbb

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1343519

Change-Id: Ie5c0a7407838babda3eca8f1b12b26ee15a2184d
parents 3ff439fe a2f97dbb
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -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"],
        },
    },
}

+2 −0
Original line number Diff line number Diff line
@@ -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,
+7 −0
Original line number Diff line number Diff line
@@ -124,6 +124,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,
@@ -145,6 +147,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: [
+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,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",