diff options
| author | Mårten Kongstad <amhk@google.com> | 2023-06-19 16:11:33 +0200 |
|---|---|---|
| committer | Mårten Kongstad <amhk@google.com> | 2023-06-19 16:12:01 +0200 |
| commit | a2e152a139cf1469ac43ee6d32c468d9286d1837 (patch) | |
| tree | faf3ced790f44f8057de26a120640ca5dd7e3ff6 | |
| parent | 403658f9cbcf4db08b0064e9f3eb6b984327d236 (diff) | |
| download | build-a2e152a139cf1469ac43ee6d32c468d9286d1837.tar.gz | |
aconfig: generate Java flag name constants
Generate Java constants for use in @FlaggedApi(flag = ...).
Also update the generated Java code to use the constants when reaching
out to DeviceConfig instead of hard-coding (duplicate) strings.
Bug: 285288440
Test: atest aconfig.test aconfig.test.java
Change-Id: I1127cacba650cc7a7896b1533e03631d7f5ec71b
| -rw-r--r-- | tools/aconfig/src/codegen_java.rs | 7 | ||||
| -rw-r--r-- | tools/aconfig/templates/Flags.java.template | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tools/aconfig/src/codegen_java.rs b/tools/aconfig/src/codegen_java.rs index 0d1b281696..47516b76c9 100644 --- a/tools/aconfig/src/codegen_java.rs +++ b/tools/aconfig/src/codegen_java.rs @@ -66,6 +66,7 @@ struct ClassElement { pub default_value: String, pub device_config_namespace: String, pub device_config_flag: String, + pub flag_name_constant_suffix: String, pub is_read_write: bool, pub method_name: String, } @@ -81,6 +82,7 @@ fn create_class_element(package: &str, pf: &ProtoParsedFlag) -> ClassElement { }, device_config_namespace: pf.namespace().to_string(), device_config_flag, + flag_name_constant_suffix: pf.name().to_ascii_uppercase(), is_read_write: pf.permission() == ProtoFlagPermission::READ_WRITE, method_name: format_java_method_name(pf.name()), } @@ -115,6 +117,11 @@ mod tests { let expect_flags_content = r#" package com.android.aconfig.test; public final class Flags { + public static final String FLAG_DISABLED_RO = "com.android.aconfig.test.disabled_ro"; + public static final String FLAG_DISABLED_RW = "com.android.aconfig.test.disabled_rw"; + public static final String FLAG_ENABLED_RO = "com.android.aconfig.test.enabled_ro"; + public static final String FLAG_ENABLED_RW = "com.android.aconfig.test.enabled_rw"; + public static boolean disabledRo() { return FEATURE_FLAGS.disabledRo(); } diff --git a/tools/aconfig/templates/Flags.java.template b/tools/aconfig/templates/Flags.java.template index 752a469afb..62116c59e2 100644 --- a/tools/aconfig/templates/Flags.java.template +++ b/tools/aconfig/templates/Flags.java.template @@ -1,6 +1,9 @@ package {package_name}; public final class Flags \{ + {{- for item in class_elements}} + public static final String FLAG_{item.flag_name_constant_suffix} = "{item.device_config_flag}"; + {{- endfor }} {{ for item in class_elements}} public static boolean {item.method_name}() \{ return FEATURE_FLAGS.{item.method_name}(); |