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

Commit f096e2d9 authored Jan 17, 2019 by Tom Cherry Committed by android-build-merger Jan 17, 2019

Merge "Statically link liblog to logd/logcat and their tests" am: 77d895b7

am: f81d1979

Change-Id: Iaa45652fd1d1b2c16ba454c5df299967568f26ac

parents 80af251e f81d1979

logcat/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,9 +25,9 @@ cc_defaults {
	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	"libcutils",		"libcutils",
	"liblog",
	"libpcrecpp",		"libpcrecpp",
	],		],
			static_libs: ["liblog"],
	logtags: ["event.logtags"],		logtags: ["event.logtags"],
	}		}

logcat/tests/Android.bp

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -48,10 +48,8 @@ cc_benchmark {
	cc_test {		cc_test {
	name: "logcat-unit-tests",		name: "logcat-unit-tests",
	defaults: ["logcat-tests-defaults"],		defaults: ["logcat-tests-defaults"],
	shared_libs: [		shared_libs: ["libbase"],
	"liblog",		static_libs: ["liblog"],
	"libbase",
	],
	srcs: [		srcs: [
	"logcat_test.cpp",		"logcat_test.cpp",
	"logcatd_test.cpp",		"logcatd_test.cpp",

logd/Android.bp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -63,11 +63,13 @@ cc_binary {

	srcs: ["main.cpp"],		srcs: ["main.cpp"],

	static_libs: ["liblogd"],		static_libs: [
			"liblog",
			"liblogd",
			],

	shared_libs: [		shared_libs: [
	"libsysutils",		"libsysutils",
	"liblog",
	"libcutils",		"libcutils",
	"libbase",		"libbase",
	"libpackagelistparser",		"libpackagelistparser",

logd/tests/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,9 +38,9 @@ cc_defaults {
	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	"libcutils",		"libcutils",
	"liblog",
	"libselinux",		"libselinux",
	],		],
			static_libs: ["liblog"],
	}		}

	// Build tests for the logger. Run with:		// Build tests for the logger. Run with: