aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJP Cottin <jpcottin@google.com>2024-02-09 16:45:31 -0800
committerJP Cottin <jpcottin@google.com>2024-02-10 00:50:40 +0000
commitf98dce46966143cb828f611c33437cf9e5ed0e50 (patch)
treeeb122a73cbd579884d44bf4778a0ab6b16cb0178
parent0be2028ebfb55711770fa1808b26db4f7a63c26b (diff)
downloadaemu-f98dce46966143cb828f611c33437cf9e5ed0e50.tar.gz
Remove concept of advancedFeaturesCanary.ini file to avoid confusion
Bug: 314184534 Change-Id: I0742592d7b8ee33312e9b37258e205150e27dac1
-rw-r--r--host-common/include/host-common/FeatureControl.h6
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)