diff options
| author | Muhammad Qureshi <muhammadq@google.com> | 2020-04-01 16:11:53 -0700 |
|---|---|---|
| committer | Muhammad Qureshi <muhammadq@google.com> | 2020-04-03 17:00:55 -0700 |
| commit | 3f9c330eefa661c2f443568f4dd97a3057b1323d (patch) | |
| tree | 35be331b62727f265c2c990b27ec1e25b09e5418 /tools/stats_log_api_gen/utils.h | |
| parent | 5afebd9a448bfb2112ca51645a2f48570064c9c1 (diff) | |
Make state_option top-level boolean annotations
- Add AnnotationId enum stats-log-api-gen
- Rename RESET_STATE annotation to TRIGGER_STATE_RESET. Also rename the proto annotation.
Bug: 152412767
Test: stats-log-api-gen-test
Test: m statslog-framework-java-gen
Change-Id: I2c12ea0b9222ef28b8cc11ea36b272e518a96259
Diffstat (limited to 'tools/stats_log_api_gen/utils.h')
| -rw-r--r-- | tools/stats_log_api_gen/utils.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/stats_log_api_gen/utils.h b/tools/stats_log_api_gen/utils.h index 1f644426ffa9..7d6d08ebbcbe 100644 --- a/tools/stats_log_api_gen/utils.h +++ b/tools/stats_log_api_gen/utils.h @@ -38,13 +38,14 @@ const int JAVA_MODULE_REQUIRES_FLOAT = 0x01; const int JAVA_MODULE_REQUIRES_ATTRIBUTION = 0x02; const int JAVA_MODULE_REQUIRES_KEY_VALUE_PAIRS = 0x04; -const map<unsigned char, string> ANNOTATION_ID_CONSTANTS = { - { ANNOTATION_ID_IS_UID, "ANNOTATION_ID_IS_UID" }, - { ANNOTATION_ID_TRUNCATE_TIMESTAMP, "ANNOTATION_ID_TRUNCATE_TIMESTAMP" }, - { ANNOTATION_ID_STATE_OPTION, "ANNOTATION_ID_STATE_OPTION" }, - { ANNOTATION_ID_RESET_STATE, "ANNOTATION_ID_RESET_STATE" }, - { ANNOTATION_ID_STATE_NESTED, "ANNOTATION_ID_STATE_NESTED" } -}; +const map<AnnotationId, string> ANNOTATION_ID_CONSTANTS = { + {ANNOTATION_ID_IS_UID, "ANNOTATION_ID_IS_UID"}, + {ANNOTATION_ID_TRUNCATE_TIMESTAMP, "ANNOTATION_ID_TRUNCATE_TIMESTAMP"}, + {ANNOTATION_ID_PRIMARY_FIELD, "ANNOTATION_ID_PRIMARY_FIELD"}, + {ANNOTATION_ID_PRIMARY_FIELD_FIRST_UID, "ANNOTATION_ID_PRIMARY_FIELD_FIRST_UID"}, + {ANNOTATION_ID_EXCLUSIVE_STATE, "ANNOTATION_ID_EXCLUSIVE_STATE"}, + {ANNOTATION_ID_TRIGGER_STATE_RESET, "ANNOTATION_ID_TRIGGER_STATE_RESET"}, + {ANNOTATION_ID_STATE_NESTED, "ANNOTATION_ID_STATE_NESTED"}}; string make_constant_name(const string& str); |