diff options
| author | Muhammad Qureshi <muhammadq@google.com> | 2019-11-24 22:14:38 -0800 |
|---|---|---|
| committer | Muhammad Qureshi <muhammadq@google.com> | 2020-01-02 14:54:16 -0800 |
| commit | 4fdc7fd375f69a3219d8680ef4da90fe8cf80020 (patch) | |
| tree | 44f9ad562f54f9f28ebdcdae44f7064391591a99 /tools/stats_log_api_gen/java_writer.cpp | |
| parent | 610a12603c78a6f680d0bbec98b0e1bd1f1b2021 (diff) | |
Support new socket schema in native codegen
New code generation implementation is flag guarded by
STATS_SCHEMA_LEGACY
Support for Q schema can be added by passing --supportQ flag in
stats_log_api_gen. (Only needed for statslog_resolv.cpp)
Q schema is supported through StatsEventCompat.
Generated R schema statslog.h:
https://paste.googleplex.com/4986214782337024
Generated R schema statslog.cpp:
https://paste.googleplex.com/4856851575341056
Generated R schema statslog_resolv.h:
https://paste.googleplex.com/6062978921136128
Generated R schema statslog_resolv.cpp:
https://paste.googleplex.com/4752329251225600
Generated Q schema statslog.h:
https://paste.googleplex.com/4766729873915904
Generated Q schema statslog.cpp:
https://paste.googleplex.com/5018563779756032
Generated Q schema statslog_resolv.h:
https://paste.googleplex.com/5338897498243072
Generated Q schema statslog_resolv.cpp:
https://paste.googleplex.com/5191011011657728
Test: m -j
Test: flashes successfully
Test: adb logcat inspection
Change-Id: I5675a80c03ca3fbd5cd4a02c04a4b9cb89ec32ab
Diffstat (limited to 'tools/stats_log_api_gen/java_writer.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/java_writer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/stats_log_api_gen/java_writer.cpp b/tools/stats_log_api_gen/java_writer.cpp index 712b48edbc1b..663d49c0d229 100644 --- a/tools/stats_log_api_gen/java_writer.cpp +++ b/tools/stats_log_api_gen/java_writer.cpp @@ -83,7 +83,9 @@ static int write_java_methods( // Print method body. string indent(""); if (DEFAULT_MODULE_NAME != moduleName) { - fprintf(out, " if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {\n"); + // TODO(b/146235828): Use just SDK_INT check once it is incremented from Q. + fprintf(out, " if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q ||\n"); + fprintf(out, " Build.VERSION.CODENAME.equals(\"R\")) {\n"); indent = " "; } |