commit 2688fe61c42fe4750a0a06f2bf9366b9cb5a5399
author Howard Ro <yro@google.com> Tue Feb 04 05:09:57 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 04 05:09:57 2020 +0000
tree de34176171e3a8979defecda8d5ec52f3b4e8038
parent 14d3112cb81ad5a8bc4128fd37556498eff2b540
parent af77b79ab665a1432947f1865ef8fa16fd73fa5e

Merge "Turn on new socket schema"

apex/statsd/framework/Android.bp

diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 231c910..5144590 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -43,6 +43,7 @@
         "//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",

cmds/statsd/Android.bp

diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 2237bf2..ebed4ee 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -110,7 +110,7 @@
     ],
 
     cflags: [
-        // "-DNEW_ENCODING_SCHEME",
+        "-DNEW_ENCODING_SCHEME",
     ],
 
     local_include_dirs: [

tools/stats_log_api_gen/Android.bp

diff --git a/tools/stats_log_api_gen/Android.bp b/tools/stats_log_api_gen/Android.bp
index d3958a6..0e32aee 100644
--- a/tools/stats_log_api_gen/Android.bp
+++ b/tools/stats_log_api_gen/Android.bp
@@ -30,7 +30,6 @@
         "utils.cpp",
     ],
     cflags: [
-        "-DSTATS_SCHEMA_LEGACY",
         "-Wall",
         "-Werror",
     ],