Merge "Statsd: Enable host_supported for libstatslog" (0d7970f4) · Commits · e / os / android_frameworks_base

tools/stats_log_api_gen/Android.bp

+13 −1

Original line number	Diff line number	Diff line
		@@ -96,6 +96,7 @@ genrule {

		cc_library_shared {
		name: "libstatslog",
		host_supported: true,
		generated_sources: ["statslog.cpp"],
		generated_headers: ["statslog.h"],
		cflags: [
		@@ -105,8 +106,19 @@ cc_library_shared {
		export_generated_headers: ["statslog.h"],
		shared_libs: [
		"liblog",
		"libutils",
		"libcutils",
		],
		static_libs: ["libstatssocket"],
		target: {
		android: {
		shared_libs: [
		"libutils",
		],
		},
		host: {
		static_libs: [
		"libutils",
		],
		},
		},
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -108,7 +108,9 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
		fprintf(out, "#include <mutex>\n");
		fprintf(out, "#include <chrono>\n");
		fprintf(out, "#include <thread>\n");
		fprintf(out, "#ifdef __ANDROID__\n");
		fprintf(out, "#include <cutils/properties.h>\n");
		fprintf(out, "#endif\n");
		fprintf(out, "#include <stats_event_list.h>\n");
		fprintf(out, "#include <log/log.h>\n");
		fprintf(out, "#include <statslog.h>\n");
		@@ -119,7 +121,11 @@ static int write_stats_log_cpp(FILE *out, const Atoms &atoms,
		fprintf(out, "namespace util {\n");
		fprintf(out, "// the single event tag id for all stats logs\n");
		fprintf(out, "const static int kStatsEventTag = 1937006964;\n");
		fprintf(out, "#ifdef __ANDROID__\n");
		fprintf(out, "const static bool kStatsdEnabled = property_get_bool(\"ro.statsd.enable\", true);\n");
		fprintf(out, "#else\n");
		fprintf(out, "const static bool kStatsdEnabled = false;\n");
		fprintf(out, "#endif\n");

		std::set<string> kTruncatingAtomNames = {"mobile_radio_power_state_changed",
		"audio_state_changed",