Merge "Make libbacktrace buildable for native_bridge" into rvc-dev (add3b3a1) · Commits · e / os / android_system_core

libbacktrace/Android.bp

+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
		@@ -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: [

+2 −0

Original line number	Diff line number	Diff line
		@@ -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",