ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: f81d1979ff

Change-Id: Iaa45652fd1d1b2c16ba454c5df299967568f26ac
This commit is contained in:
Tom Cherry 2019-01-17 15:38:11 -08:00 • committed by android-build-merger
commit f096e2d931
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
logcat/Android.bp
View file

@ -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"],
} }

6
logcat/tests/Android.bp
View file

@ -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",

6
logd/Android.bp
View file

@ -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",

2
logd/tests/Android.bp
View file

@ -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: