Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 895380d4 authored Feb 27, 2020 by Automerger Merge Worker

Merge "Move libstatssocket to shared." into rvc-dev am: cb50e94e

Change-Id: I6d932c1e493ff6332c76af6d8e8fac81e606b877

parents b14913ae cb50e94e

apex/statsd/Android.bp

+0 −4

Original line number	Diff line number	Diff line
		@@ -63,11 +63,7 @@ cc_library_shared {
		shared_libs: [
		"libnativehelper", // Has stable abi - should not be copied into apex.
		"liblog", // Has a stable abi - should not be copied into apex.
		],
		static_libs: [
		//TODO: make shared - need libstatssocket to also live in the apex.
		"libstatssocket",
		"libcutils", // TODO: remove - needed by libstatssocket
		],
		//TODO: is libc++_static correct?
		stl: "libc++_static",

core/java/com/android/internal/logging/MetricsLogger.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -55,12 +55,9 @@ public class MetricsLogger {
		protected void saveLog(LogMaker log) {
		// TODO(b/116684537): Flag guard logging to event log and statsd socket.
		EventLogTags.writeSysuiMultiAction(log.serialize());
		if (log.getCategory() != MetricsEvent.RESERVED_FOR_LOGBUILDER_COUNTER
		&& log.getCategory() != MetricsEvent.RESERVED_FOR_LOGBUILDER_HISTOGRAM) {
		FrameworkStatsLog.write(FrameworkStatsLog.KEY_VALUE_PAIRS_ATOM,
		/* UID is retrieved from statsd side */ 0, log.getEntries());
		}
		}

		public static final int VIEW_UNKNOWN = MetricsEvent.VIEW_UNKNOWN;
		public static final int LOGTAG = EventLogTags.SYSUI_MULTI_ACTION;

core/jni/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,6 @@ cc_library_shared {
		"libseccomp_policy",
		"libgrallocusage",
		"libscrypt_static",
		"libstatssocket",
		],

		shared_libs: [
		@@ -266,6 +265,7 @@ cc_library_shared {
		"libdl",
		"libdl_android",
		"libstatslog",
		"libstatssocket",
		"libtimeinstate",
		"server_configurable_flags",
		"libstatspull",