From af77b79ab665a1432947f1865ef8fa16fd73fa5e Mon Sep 17 00:00:00 2001 From: Muhammad Qureshi Date: Fri, 17 Jan 2020 11:28:45 -0800 Subject: [PATCH] Turn on new socket schema This switches stats-log-api-gen to use StatsEvent.java and stats_event.c/StatsLogCompat.cpp in generated StatsLog write methods. Bug: 143979391 Test: m Test: fastboot flashall Test: atest CtsStatsdHostTestCases Change-Id: I56f58d5545e51a0d7a34ec835110f5bc1b069d57 --- apex/statsd/framework/Android.bp | 1 + cmds/statsd/Android.bp | 2 +- tools/stats_log_api_gen/Android.bp | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp index 231c91026bb60..514459003efe9 100644 --- a/apex/statsd/framework/Android.bp +++ b/apex/statsd/framework/Android.bp @@ -43,6 +43,7 @@ java_library { "//frameworks/base/apex/statsd:__subpackages__", //TODO(b/146167933) remove this when framework is built with framework-statsd-stubs "//frameworks/base", + "//frameworks/opt/net/wifi/service", ], apex_available: [ "com.android.os.statsd", diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index fdc7fce3b8845..25df7d55bf69c 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -112,7 +112,7 @@ cc_defaults { ], cflags: [ - // "-DNEW_ENCODING_SCHEME", + "-DNEW_ENCODING_SCHEME", ], local_include_dirs: [ diff --git a/tools/stats_log_api_gen/Android.bp b/tools/stats_log_api_gen/Android.bp index d3958a65c7045..0e32aee93ebd5 100644 --- a/tools/stats_log_api_gen/Android.bp +++ b/tools/stats_log_api_gen/Android.bp @@ -30,7 +30,6 @@ cc_binary_host { "utils.cpp", ], cflags: [ - "-DSTATS_SCHEMA_LEGACY", "-Wall", "-Werror", ],