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

Commit 348a0824 authored Oct 03, 2017 by Dan Willemsen Committed by android-build-merger Oct 03, 2017

Merge changes from topic "linux_glibc"

am: 7b3d4da9

Change-Id: I1cb69992882db5a265234ac808d408f1f136f0e5

parents 0a3b1d31 7b3d4da9

base/Android.bp

+2 −2

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

libbacktrace/Android.bp

+3 −3

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

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

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

libdiskconfig/Android.bp

+1 −1

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

libutils/Android.bp

+1 −1

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

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

libutils/tests/Android.bp

+1 −1

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