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

Commit 5bb9220b authored Mar 16, 2017 by Dan Willemsen Committed by android-build-merger Mar 16, 2017

Merge "Enable more modules on linux_bionic builds"

am: 75c414d1

Change-Id: If8a08b3f080344e61ebf5a0555354edb95cfb92e

parents a1f43ebf 75c414d1

debuggerd/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		cc_defaults {
		name: "debuggerd_defaults",
		defaults: ["linux_bionic_supported"],
		cflags: [
		"-Wall",
		"-Wextra",

libbacktrace/Android.bp

+12 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,18 @@ cc_library {
		static_libs: ["libcutils"],
		host_ldlibs: ["-lrt"],
		},
		linux_bionic: {
		enabled: true,
		srcs: libbacktrace_sources,

		shared_libs: [
		"libbase",
		"liblog",
		"libunwind",
		],

		static_libs: ["libcutils"],
		},
		android: {
		srcs: libbacktrace_sources,

libcutils/Android.bp

+10 −4

Original line number	Diff line number	Diff line
		@@ -41,6 +41,9 @@ cc_library_headers {
		host_supported: true,
		export_include_dirs: ["include"],
		target: {
		linux_bionic: {
		enabled: true,
		},
		windows: {
		enabled: true,
		},
		@@ -68,11 +71,14 @@ cc_library {
		"threads.c",
		],


		target: {
		host: {
		srcs: ["dlmalloc_stubs.c"],
		},
		linux_bionic: {
		enabled: true,
		exclude_srcs: ["dlmalloc_stubs.c"],
		},
		not_windows: {
		srcs: libcutils_nonwindows_sources + [
		"ashmem-host.c",

libprocinfo/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,9 @@ cc_library {
		darwin: {
		enabled: false,
		},
		linux_bionic: {
		enabled: true,
		},
		windows: {
		enabled: false,
		},

libutils/Android.bp

+5 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@ cc_library_headers {
		host_supported: true,
		export_include_dirs: ["include"],
		target: {
		linux_bionic: {
		enabled: true,
		},
		windows: {
		enabled: true,
		},