Merge "Build /vendor/bin/logwrapper too." into pi-dev (c8014f7e) · Commits · e / os / android_system_core

logwrapper/Android.bp

+33 −16

Original line number	Diff line number	Diff line

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

logwrapper/logwrap.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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))

shell_and_utilities/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@ phony {
		"bzip2",
		"grep",
		"grep_vendor",
		"logwrapper",
		"logwrapper_vendor",
		"mkshrc",
		"mkshrc_vendor",
		"reboot",