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

Commit 2c6b2ebe authored Sep 30, 2017 by Dan Willemsen Committed by android-build-merger Sep 30, 2017

Merge "Remove default libraries" am: 8b7feee3 am: a0113de2

am: 55181f7c

Change-Id: I2fa1d556537ee4f3b2e67cd35aa3ce090b3684a6

parents e15961fe 55181f7c

base/Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ cc_library {
		"errors_unix.cpp",
		],
		cppflags: ["-Wexit-time-destructors"],
		host_ldlibs: ["-lrt"],
		},
		windows: {
		srcs: [
		@@ -138,7 +137,6 @@ cc_test {
		},
		linux: {
		srcs: ["chrono_utils_test.cpp"],
		host_ldlibs: ["-lrt"],
		},
		windows: {
		srcs: ["utf8_test.cpp"],

libbacktrace/Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ cc_library {
		],

		static_libs: ["libcutils"],
		host_ldlibs: ["-lrt"],
		},
		linux_bionic: {
		enabled: true,
		@@ -229,15 +228,11 @@ cc_test {
		android: {
		cflags: ["-DENABLE_PSS_TESTS"],
		shared_libs: [
		"libdl",
		"libutils",
		],
		},
		linux: {
		host_ldlibs: [
		"-lpthread",
		"-lrt",
		"-ldl",
		"-lncurses",
		],
		static_libs: ["libutils"],

liblog/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -91,9 +91,6 @@ cc_library {
		not_windows: {
		srcs: ["event_tag_map.cpp"],
		},
		linux: {
		host_ldlibs: ["-lrt"],
		},
		linux_bionic: {
		enabled: true,
		},

libnativebridge/Android.bp

+0 −7

Original line number	Diff line number	Diff line
		@@ -22,13 +22,6 @@ cc_library {
		cppflags: [
		"-fvisibility=protected",
		],

		host_ldlibs: ["-ldl"],
		target: {
		android: {
		shared_libs: ["libdl"],
		},
		},
		}

		subdirs = ["tests"]

libnativebridge/tests/Android.bp

+0 −8

Original line number	Diff line number	Diff line
		@@ -25,14 +25,6 @@ cc_defaults {
		],
		header_libs: ["libnativebridge-dummy-headers"],
		cppflags: ["-fvisibility=protected"],
		target: {
		android: {
		shared_libs: ["libdl"],
		},
		host: {
		host_ldlibs: ["-ldl"],
		},
		},
		}

		cc_library_shared {