Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I6d932c1e493ff6332c76af6d8e8fac81e606b877
This commit is contained in:
Automerger Merge Worker
2020-02-27 01:03:09 +00:00
parent b14913ae66 cb50e94e7a
commit 895380d497
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/statsd/Android.bp
View File

@@ -63,11 +63,7 @@ cc_library_shared {
shared_libs: [ shared_libs: [
"libnativehelper", // Has stable abi - should not be copied into apex. "libnativehelper", // Has stable abi - should not be copied into apex.
"liblog", // Has a 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", "libstatssocket",
"libcutils", // TODO: remove - needed by libstatssocket
], ],
//TODO: is libc++_static correct? //TODO: is libc++_static correct?
stl: "libc++_static", stl: "libc++_static",

7
core/java/com/android/internal/logging/MetricsLogger.java
View File

@@ -55,11 +55,8 @@ public class MetricsLogger {
protected void saveLog(LogMaker log) { protected void saveLog(LogMaker log) {
// TODO(b/116684537): Flag guard logging to event log and statsd socket. // TODO(b/116684537): Flag guard logging to event log and statsd socket.
EventLogTags.writeSysuiMultiAction(log.serialize()); EventLogTags.writeSysuiMultiAction(log.serialize());
if (log.getCategory() != MetricsEvent.RESERVED_FOR_LOGBUILDER_COUNTER FrameworkStatsLog.write(FrameworkStatsLog.KEY_VALUE_PAIRS_ATOM,
&& log.getCategory() != MetricsEvent.RESERVED_FOR_LOGBUILDER_HISTOGRAM) { /* UID is retrieved from statsd side */ 0, log.getEntries());
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 VIEW_UNKNOWN = MetricsEvent.VIEW_UNKNOWN;

2
core/jni/Android.bp
View File

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