diff options
author | Elliott Hughes | 2018-04-10 16:48:21 -0500 |
---|---|---|
committer | Elliott Hughes | 2018-04-11 10:28:37 -0500 |
commit | 0b539f3bcb9ff768ab642cddb0735c490f253be3 (patch) | |
tree | 18384d367cb98fc9a49364262c02647280a91b23 | |
parent | 20d21598033bb682a54ec1eca2568e030ad92e46 (diff) | |
download | platform-system-core-0b539f3bcb9ff768ab642cddb0735c490f253be3.tar.gz platform-system-core-0b539f3bcb9ff768ab642cddb0735c490f253be3.tar.xz platform-system-core-0b539f3bcb9ff768ab642cddb0735c490f253be3.zip |
Build /vendor/bin/logwrapper too.
Bug: https://issuetracker.google.com/77284669
Test: builds
Change-Id: Iaafc856f2a7441d318f7b9376caa6629e02a8e23
-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 @@ | |||
1 | 1 | cc_defaults { | |
2 | name: "logwrapper_defaults", | ||
3 | cflags: [ | ||
4 | "-Werror", | ||
5 | ], | ||
6 | } | ||
2 | 7 | ||
3 | // ======================================================== | 8 | // ======================================================== |
4 | // Static and shared library | 9 | // Static and shared library |
5 | // ======================================================== | 10 | // ======================================================== |
11 | |||
6 | cc_library { | 12 | cc_library { |
7 | name: "liblogwrap", | 13 | name: "liblogwrap", |
14 | defaults: ["logwrapper_defaults"], | ||
8 | srcs: ["logwrap.c"], | 15 | srcs: ["logwrap.c"], |
9 | shared_libs: [ | 16 | shared_libs: [ |
10 | "libcutils", | 17 | "libcutils", |
@@ -12,32 +19,45 @@ cc_library { | |||
12 | ], | 19 | ], |
13 | export_include_dirs: ["include"], | 20 | export_include_dirs: ["include"], |
14 | local_include_dirs: ["include"], | 21 | local_include_dirs: ["include"], |
15 | cflags: [ | ||
16 | "-Werror", | ||
17 | ], | ||
18 | } | 22 | } |
19 | 23 | ||
20 | // ======================================================== | 24 | // ======================================================== |
21 | // Executable | 25 | // Executable |
22 | // ======================================================== | 26 | // ======================================================== |
27 | |||
28 | cc_defaults { | ||
29 | name: "logwrapper_common", | ||
30 | defaults: ["logwrapper_defaults"], | ||
31 | local_include_dirs: ["include"], | ||
32 | srcs: [ | ||
33 | "logwrap.c", | ||
34 | "logwrapper.c", | ||
35 | ], | ||
36 | shared_libs: ["libcutils", "liblog"], | ||
37 | } | ||
38 | |||
23 | cc_binary { | 39 | cc_binary { |
24 | name: "logwrapper", | 40 | name: "logwrapper", |
25 | srcs: ["logwrapper.c"], | 41 | defaults: ["logwrapper_common"], |
26 | static_libs: [ | 42 | } |
27 | "liblog", | 43 | |
28 | "liblogwrap", | 44 | // Build vendor logwrapper. |
29 | "libcutils", | 45 | // TODO: Add vendor_available to "logwrapper" module and remove "logwrapper_vendor" module |
30 | ], | 46 | // when vendor_available is fully supported. |
31 | cflags: [ | 47 | cc_binary { |
32 | "-Werror", | 48 | name: "logwrapper_vendor", |
33 | ], | 49 | stem: "logwrapper", |
50 | vendor: true, | ||
51 | defaults: ["logwrapper_common"], | ||
34 | } | 52 | } |
35 | 53 | ||
36 | // ======================================================== | 54 | // ======================================================== |
37 | // Benchmark | 55 | // Benchmark |
38 | // ======================================================== | 56 | // ======================================================== |
57 | |||
39 | cc_benchmark { | 58 | cc_benchmark { |
40 | name: "android_fork_execvp_ext_benchmark", | 59 | name: "android_fork_execvp_ext_benchmark", |
60 | defaults: ["logwrapper_defaults"], | ||
41 | srcs: [ | 61 | srcs: [ |
42 | "android_fork_execvp_ext_benchmark.cpp", | 62 | "android_fork_execvp_ext_benchmark.cpp", |
43 | ], | 63 | ], |
@@ -47,7 +67,4 @@ cc_benchmark { | |||
47 | "liblog", | 67 | "liblog", |
48 | "liblogwrap", | 68 | "liblogwrap", |
49 | ], | 69 | ], |
50 | cflags: [ | ||
51 | "-Werror", | ||
52 | ], | ||
53 | } | 70 | } |
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 @@ | |||
31 | #include <cutils/klog.h> | 31 | #include <cutils/klog.h> |
32 | #include <log/log.h> | 32 | #include <log/log.h> |
33 | #include <logwrap/logwrap.h> | 33 | #include <logwrap/logwrap.h> |
34 | #include <private/android_filesystem_config.h> | ||
35 | 34 | ||
36 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) | 35 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) |
37 | #define MIN(a,b) (((a)<(b))?(a):(b)) | 36 | #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 { | |||
6 | "bzip2", | 6 | "bzip2", |
7 | "grep", | 7 | "grep", |
8 | "grep_vendor", | 8 | "grep_vendor", |
9 | "logwrapper", | ||
10 | "logwrapper_vendor", | ||
9 | "mkshrc", | 11 | "mkshrc", |
10 | "mkshrc_vendor", | 12 | "mkshrc_vendor", |
11 | "reboot", | 13 | "reboot", |