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

Commit 55f9ae52 authored Oct 03, 2017 by Dan Willemsen Committed by android-build-merger Oct 03, 2017

Merge changes from topic "linux_glibc" am: 7b3d4da9 am: 348a0824

am: 60a410d6

Change-Id: I58b1b45ae68d908522afb61b272dba01e82f1009

parents cbeae7f8 60a410d6

base/Android.bp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,7 @@ cc_library {
	cppflags: ["-Wexit-time-destructors"],		cppflags: ["-Wexit-time-destructors"],
	enabled: true,		enabled: true,
	},		},
	linux: {		linux_glibc: {
	srcs: [		srcs: [
	"chrono_utils.cpp",		"chrono_utils.cpp",
	"errors_unix.cpp",		"errors_unix.cpp",
	@@ -135,7 +135,7 @@ cc_test {
	misc_undefined: ["integer"],		misc_undefined: ["integer"],
	},		},
	},		},
	linux: {		linux_glibc: {
	srcs: ["chrono_utils_test.cpp"],		srcs: ["chrono_utils_test.cpp"],
	},		},
	windows: {		windows: {

libbacktrace/Android.bp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -83,7 +83,7 @@ cc_library {
	darwin: {		darwin: {
	enabled: true,		enabled: true,
	},		},
	linux: {		linux_glibc: {
	srcs: libbacktrace_sources,		srcs: libbacktrace_sources,

	shared_libs: [		shared_libs: [
	@@ -135,7 +135,7 @@ cc_library_shared {
	srcs: ["backtrace_testlib.cpp"],		srcs: ["backtrace_testlib.cpp"],

	target: {		target: {
	linux: {		linux_glibc: {
	shared_libs: [		shared_libs: [
	"libunwind",		"libunwind",
	"libunwindstack",		"libunwindstack",
	@@ -231,7 +231,7 @@ cc_test {
	"libutils",		"libutils",
	],		],
	},		},
	linux: {		linux_glibc: {
	host_ldlibs: [		host_ldlibs: [
	"-lncurses",		"-lncurses",
	],		],

libdiskconfig/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ cc_library {
	darwin: {		darwin: {
	enabled: false,		enabled: false,
	},		},
	linux: {		linux_glibc: {
	cflags: [		cflags: [
	"-O2",		"-O2",
	"-g",		"-g",

libutils/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -124,7 +124,7 @@ cc_library {
	},		},
	},		},

	linux: {		linux_glibc: {
	srcs: [		srcs: [
	"Looper.cpp",		"Looper.cpp",
	"ProcessCallStack.cpp",		"ProcessCallStack.cpp",

libutils/tests/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@ cc_test {
	"libbase",		"libbase",
	],		],
	},		},
	linux: {		linux_glibc: {
	srcs: [		srcs: [
	"Looper_test.cpp",		"Looper_test.cpp",
	"RefBase_test.cpp",		"RefBase_test.cpp",