diff options
| author | JP Cottin <jpcottin@google.com> | 2024-02-13 22:35:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-13 22:35:04 +0000 |
| commit | ad91a448980c65e6f366feda59eb75961f06489e (patch) | |
| tree | bcfab14b16f1e6b4ff42eebc6378ef5ccbcd891e | |
| parent | 8cb6837e4a0851efe6137740fa18171405db3824 (diff) | |
| parent | f98dce46966143cb828f611c33437cf9e5ed0e50 (diff) | |
| download | aemu-ad91a448980c65e6f366feda59eb75961f06489e.tar.gz | |
Merge "Remove concept of advancedFeaturesCanary.ini file to avoid confusion" into main
| -rw-r--r-- | host-common/include/host-common/FeatureControl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/host-common/include/host-common/FeatureControl.h b/host-common/include/host-common/FeatureControl.h index 0b4593c..57e0621 100644 --- a/host-common/include/host-common/FeatureControl.h +++ b/host-common/include/host-common/FeatureControl.h @@ -28,9 +28,7 @@ namespace featurecontrol { // featurecontrol is used to switch on/off advanced features It loads // sdk/emulator/lib/advancedFeatures.ini for default values and -// .android/advancedFeatures.ini for user overriden values. If on canary -// update channel, sdk/emulator/lib/advancedFeaturesCanary.ini is used for -// default values. +// .android/advancedFeatures.ini for user overridden values. // It is expected to be initialized at the beginning of the emulator. // For easier testing, one may also want to pass the override value through // command line and call setEnabledOverride. (Command line override not @@ -39,7 +37,7 @@ namespace featurecontrol { // featurecontrol::isEnabled is thread safe, all other methods are not. // // To add new features, please (1) add it to android/data/advancedFeatures.ini -// or android/data/advancedFeaturesCanary.ini and (2) add a new line to +// and (2) add a new line to // FeatureControlDef.h, in the following format: // FEATURE_CONTROL_ITEM(YOUR_FEATURE_NAME) |