StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "aconfig: flag java lib enable optimization" into main

Browse Source
This commit is contained in:
Zhi Dou
2023-09-06 12:56:46 +00:00
committed by Gerrit Code Review
parent 9ee5ca6b37 deafa792eb
commit 58fd788f51
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aconfig/src/codegen_java.rs
View File

@@ -119,9 +119,12 @@ mod tests {
const EXPECTED_FEATUREFLAGS_COMMON_CONTENT: &str = r#" const EXPECTED_FEATUREFLAGS_COMMON_CONTENT: &str = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
public interface FeatureFlags { public interface FeatureFlags {
@com.android.aconfig.annotations.AssumeFalseForR8
boolean disabledRo(); boolean disabledRo();
boolean disabledRw(); boolean disabledRw();
@com.android.aconfig.annotations.AssumeTrueForR8
boolean enabledFixedRo(); boolean enabledFixedRo();
@com.android.aconfig.annotations.AssumeTrueForR8
boolean enabledRo(); boolean enabledRo();
boolean enabledRw(); boolean enabledRw();
} }
@@ -136,15 +139,18 @@ mod tests {
public static final String FLAG_ENABLED_RO = "com.android.aconfig.test.enabled_ro"; 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 final String FLAG_ENABLED_RW = "com.android.aconfig.test.enabled_rw";
@com.android.aconfig.annotations.AssumeFalseForR8
public static boolean disabledRo() { public static boolean disabledRo() {
return FEATURE_FLAGS.disabledRo(); return FEATURE_FLAGS.disabledRo();
} }
public static boolean disabledRw() { public static boolean disabledRw() {
return FEATURE_FLAGS.disabledRw(); return FEATURE_FLAGS.disabledRw();
} }
@com.android.aconfig.annotations.AssumeTrueForR8
public static boolean enabledFixedRo() { public static boolean enabledFixedRo() {
return FEATURE_FLAGS.enabledFixedRo(); return FEATURE_FLAGS.enabledFixedRo();
} }
@com.android.aconfig.annotations.AssumeTrueForR8
public static boolean enabledRo() { public static boolean enabledRo() {
return FEATURE_FLAGS.enabledRo(); return FEATURE_FLAGS.enabledRo();
} }

7
tools/aconfig/templates/FeatureFlags.java.template
View File

@@ -2,6 +2,13 @@ package {package_name};
public interface FeatureFlags \{ public interface FeatureFlags \{
{{ for item in class_elements}} {{ for item in class_elements}}
{{ -if not item.is_read_write }}
{{ -if item.default_value }}
@com.android.aconfig.annotations.AssumeTrueForR8
{{ -else }}
@com.android.aconfig.annotations.AssumeFalseForR8
{{ -endif- }}
{{ endif }}
boolean {item.method_name}(); boolean {item.method_name}();
{{ endfor }} {{ endfor }}
} }

9
tools/aconfig/templates/Flags.java.template
View File

@@ -5,6 +5,13 @@ public final class Flags \{
public static final String FLAG_{item.flag_name_constant_suffix} = "{item.device_config_flag}"; public static final String FLAG_{item.flag_name_constant_suffix} = "{item.device_config_flag}";
{{- endfor }} {{- endfor }}
{{ for item in class_elements}} {{ for item in class_elements}}
{{ -if not item.is_read_write }}
{{ -if item.default_value }}
@com.android.aconfig.annotations.AssumeTrueForR8
{{ -else }}
@com.android.aconfig.annotations.AssumeFalseForR8
{{ -endif- }}
{{ endif }}
public static boolean {item.method_name}() \{ public static boolean {item.method_name}() \{
return FEATURE_FLAGS.{item.method_name}(); return FEATURE_FLAGS.{item.method_name}();
} }
@@ -17,7 +24,7 @@ public final class Flags \{
public static void unsetFeatureFlags() \{ public static void unsetFeatureFlags() \{
Flags.FEATURE_FLAGS = null; Flags.FEATURE_FLAGS = null;
} }
{{ endif}} {{ endif }}
private static FeatureFlags FEATURE_FLAGS{{ -if not is_test_mode }} = new FeatureFlagsImpl(){{ -endif- }}; private static FeatureFlags FEATURE_FLAGS{{ -if not is_test_mode }} = new FeatureFlagsImpl(){{ -endif- }};
} }