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

Merge "Revert "Revert "aconfig: @hide generated Java code""" into main

Browse Source
This commit is contained in:
Mårten Kongstad
2023-09-11 14:08:55 +00:00
committed by Gerrit Code Review
parent 1ee8f4d232 65efa27f71
commit 72c3b38a1d
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,6 +118,7 @@ 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;
/** @hide */
public interface FeatureFlags { public interface FeatureFlags {
@com.android.aconfig.annotations.AssumeFalseForR8 @com.android.aconfig.annotations.AssumeFalseForR8
boolean disabledRo(); boolean disabledRo();
@@ -132,6 +133,7 @@ mod tests {
const EXPECTED_FLAG_COMMON_CONTENT: &str = r#" const EXPECTED_FLAG_COMMON_CONTENT: &str = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
/** @hide */
public final class Flags { public final class Flags {
public static final String FLAG_DISABLED_RO = "com.android.aconfig.test.disabled_ro"; 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_DISABLED_RW = "com.android.aconfig.test.disabled_rw";
@@ -163,6 +165,7 @@ mod tests {
package com.android.aconfig.test; package com.android.aconfig.test;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** @hide */
public class FakeFeatureFlagsImpl implements FeatureFlags { public class FakeFeatureFlagsImpl implements FeatureFlags {
public FakeFeatureFlagsImpl() { public FakeFeatureFlagsImpl() {
resetAll(); resetAll();
@@ -234,6 +237,7 @@ mod tests {
let expect_featureflagsimpl_content = r#" let expect_featureflagsimpl_content = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
/** @hide */
public final class FeatureFlagsImpl implements FeatureFlags { public final class FeatureFlagsImpl implements FeatureFlags {
@Override @Override
public boolean disabledRo() { public boolean disabledRo() {
@@ -316,6 +320,7 @@ mod tests {
"#; "#;
let expect_featureflagsimpl_content = r#" let expect_featureflagsimpl_content = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
/** @hide */
public final class FeatureFlagsImpl implements FeatureFlags { public final class FeatureFlagsImpl implements FeatureFlags {
@Override @Override
public boolean disabledRo() { public boolean disabledRo() {

1
tools/aconfig/templates/FakeFeatureFlagsImpl.java.template
View File

@@ -3,6 +3,7 @@ package {package_name};
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** @hide */
public class FakeFeatureFlagsImpl implements FeatureFlags \{ public class FakeFeatureFlagsImpl implements FeatureFlags \{
public FakeFeatureFlagsImpl() \{ public FakeFeatureFlagsImpl() \{
resetAll(); resetAll();

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

@@ -1,5 +1,6 @@
package {package_name}; package {package_name};
/** @hide */
public interface FeatureFlags \{ public interface FeatureFlags \{
{{ for item in class_elements}} {{ for item in class_elements}}
{{ -if not item.is_read_write }} {{ -if not item.is_read_write }}

2
tools/aconfig/templates/FeatureFlagsImpl.java.template
View File

@@ -3,6 +3,7 @@ package {package_name};
{{ if is_read_write- }} {{ if is_read_write- }}
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
{{ endif }} {{ endif }}
/** @hide */
public final class FeatureFlagsImpl implements FeatureFlags \{ public final class FeatureFlagsImpl implements FeatureFlags \{
{{ for item in class_elements}} {{ for item in class_elements}}
@Override @Override
@@ -21,6 +22,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
} }
{{ else }} {{ else }}
{#- Generate only stub if in test mode #} {#- Generate only stub if in test mode #}
/** @hide */
public final class FeatureFlagsImpl implements FeatureFlags \{ public final class FeatureFlagsImpl implements FeatureFlags \{
{{ for item in class_elements}} {{ for item in class_elements}}
@Override @Override

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

@@ -1,5 +1,6 @@
package {package_name}; package {package_name};
/** @hide */
public final class Flags \{ public final class Flags \{
{{- for item in class_elements}} {{- for item in class_elements}}
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}";