commit a2e152a139cf1469ac43ee6d32c468d9286d1837
author Mårten Kongstad <amhk@google.com> Mon Jun 19 16:11:33 2023 +0200
committer Mårten Kongstad <amhk@google.com> Mon Jun 19 16:12:01 2023 +0200
tree faf3ced790f44f8057de26a120640ca5dd7e3ff6
parent 403658f9cbcf4db08b0064e9f3eb6b984327d236

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

tools/aconfig/src/codegen_java.rs

diff --git a/tools/aconfig/src/codegen_java.rs b/tools/aconfig/src/codegen_java.rs
index 0d1b281..47516b7 100644
--- a/tools/aconfig/src/codegen_java.rs
+++ b/tools/aconfig/src/codegen_java.rs
@@ -66,6 +66,7 @@
     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 @@
         },
         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 @@
         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();
             }

tools/aconfig/templates/Flags.java.template

diff --git a/tools/aconfig/templates/Flags.java.template b/tools/aconfig/templates/Flags.java.template
index 752a469..62116c5 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}();