diff options
| author | Elliott Hughes <enh@google.com> | 2018-04-10 14:48:21 -0700 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2018-04-12 12:12:46 +0000 |
| commit | 5a4c20bc21d08c0649fff6c1a42fbb0847d9036a (patch) | |
| tree | a6299bd18e65b4208a3c97c4ca13f1ef641977c6 | |
| parent | 65ce3b2cd879e39d75012798eef348283ad8b4f3 (diff) | |
Build /vendor/bin/logwrapper too.
Bug: 77284669
Test: builds
Change-Id: Iaafc856f2a7441d318f7b9376caa6629e02a8e23
Merged-In: Iaafc856f2a7441d318f7b9376caa6629e02a8e23
(cherry picked from commit 0b539f3bcb9ff768ab642cddb0735c490f253be3)
| -rw-r--r-- | logwrapper/Android.bp | 49 | ||||
| -rw-r--r-- | logwrapper/logwrap.c | 1 | ||||
| -rw-r--r-- | shell_and_utilities/Android.bp | 2 |
3 files changed, 35 insertions, 17 deletions
diff --git a/logwrapper/Android.bp b/logwrapper/Android.bp index f163f576b..54506dce7 100644 --- a/logwrapper/Android.bp +++ b/logwrapper/Android.bp @@ -1,10 +1,17 @@ - +cc_defaults { + name: "logwrapper_defaults", + cflags: [ + "-Werror", + ], +} // ======================================================== // Static and shared library // ======================================================== + cc_library { name: "liblogwrap", + defaults: ["logwrapper_defaults"], srcs: ["logwrap.c"], shared_libs: [ "libcutils", @@ -12,32 +19,45 @@ cc_library { ], export_include_dirs: ["include"], local_include_dirs: ["include"], - cflags: [ - "-Werror", - ], } // ======================================================== // Executable // ======================================================== + +cc_defaults { + name: "logwrapper_common", + defaults: ["logwrapper_defaults"], + local_include_dirs: ["include"], + srcs: [ + "logwrap.c", + "logwrapper.c", + ], + shared_libs: ["libcutils", "liblog"], +} + cc_binary { name: "logwrapper", - srcs: ["logwrapper.c"], - static_libs: [ - "liblog", - "liblogwrap", - "libcutils", - ], - cflags: [ - "-Werror", - ], + defaults: ["logwrapper_common"], +} + +// Build vendor logwrapper. +// TODO: Add vendor_available to "logwrapper" module and remove "logwrapper_vendor" module +// when vendor_available is fully supported. +cc_binary { + name: "logwrapper_vendor", + stem: "logwrapper", + vendor: true, + defaults: ["logwrapper_common"], } // ======================================================== // Benchmark // ======================================================== + cc_benchmark { name: "android_fork_execvp_ext_benchmark", + defaults: ["logwrapper_defaults"], srcs: [ "android_fork_execvp_ext_benchmark.cpp", ], @@ -47,7 +67,4 @@ cc_benchmark { "liblog", "liblogwrap", ], - cflags: [ - "-Werror", - ], } diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c index 7076078dc..86219936d 100644 --- a/logwrapper/logwrap.c +++ b/logwrapper/logwrap.c @@ -31,7 +31,6 @@ #include <cutils/klog.h> #include <log/log.h> #include <logwrap/logwrap.h> -#include <private/android_filesystem_config.h> #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #define MIN(a,b) (((a)<(b))?(a):(b)) diff --git a/shell_and_utilities/Android.bp b/shell_and_utilities/Android.bp index 3ccb92f1b..2e42b7099 100644 --- a/shell_and_utilities/Android.bp +++ b/shell_and_utilities/Android.bp @@ -6,6 +6,8 @@ phony { "bzip2", "grep", "grep_vendor", + "logwrapper", + "logwrapper_vendor", "mkshrc", "mkshrc_vendor", "reboot", |