Merge "liblog: update Android.bp" into nyc-dev (033bc9f3) · Commits · e / os / android_system_core

liblog/Android.bp

+18 −6

Original line number	Diff line number	Diff line
		@@ -14,20 +14,30 @@
		// limitations under the License.
		//

		liblog_host_sources = [
		"logd_write.c",
		liblog_sources = [
		"log_event_list.c",
		"log_event_write.c",
		"logger_write.c",
		"config_write.c",
		"logger_name.c",
		"logger_lock.c",
		]
		liblog_host_sources = [
		"fake_log_device.c",
		//"event.logtags",
		"fake_writer.c",
		]
		liblog_target_sources = [
		"logd_write.c",
		"log_event_write.c",
		"event_tag_map.c",
		"config_read.c",
		"log_time.cpp",
		"log_is_loggable.c",
		"logprint.c",
		"log_read.c",
		"pmsg_reader.c",
		"pmsg_writer.c",
		"logd_reader.c",
		"logd_writer.c",
		"logger_read.c",
		]

		// Shared and static library for host and device
		@@ -36,6 +46,8 @@ cc_library {
		name: "liblog",
		host_supported: true,

		srcs: liblog_sources,

		target: {
		host: {
		srcs: liblog_host_sources,
		@@ -64,6 +76,7 @@ cc_library {

		cflags: [
		"-Werror",
		"-fvisibility=hidden",
		// This is what we want to do:
		// liblog_cflags := $(shell \
		// sed -n \
		@@ -71,7 +84,6 @@ cc_library {
		// $(LOCAL_PATH)/event.logtags)
		// so make sure we do not regret hard-coding it as follows:
		"-DLIBLOG_LOG_TAG=1005",
		"-DSNET_EVENT_LOG_TAG=1397638484",
		],
		compile_multilib: "both",
		stl: "none",