commit 62693835202c9b90284762d634db11351141042e
author Howard Ro <yro@google.com> Tue Feb 04 21:51:49 2020 -0800
committer Howard Ro <yro@google.com> Tue Feb 04 21:53:40 2020 -0800
tree 112ad6d9d81fe2408e5d67be8ff21daecefa5091
parent ef4dc78c46b23c6b16eb0f89ecfd8ab474bbc267

Turn back to the old socket schema

Bug: 148909969
Test: GTS tests pass after this change (they fail otherwise)
Change-Id: Iee8d6506c4fb2fbf3acef474f9ee13df1b764c41

cmds/statsd/Android.bp

diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index ebed4ee..2237bf2 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 0e32aee..d3958a6 100644
--- a/tools/stats_log_api_gen/Android.bp
+++ b/tools/stats_log_api_gen/Android.bp
@@ -30,6 +30,7 @@
         "utils.cpp",
     ],
     cflags: [
+        "-DSTATS_SCHEMA_LEGACY",
         "-Wall",
         "-Werror",
     ],