Move flag feature_overrides to namespace "gpu"
Move the aconfig feature flag "feature_overrides" from the
"core_graphics" namespace to "gpu".
Note: This necessitates a new flag name as well:
go/aconfig-namespace#aconfig-namespaces-2
> Once a flag's declaration is merged, its namespace cannot be changed.
> If you've assigned the incorrect namespace, rename the flag and assign
> the correct namespace in the same change.
Due to this, the name is being changed to "angle_feature_overrides".
Old:
com.android.graphics.graphicsenv.flags.feature_overrides
New:
com.android.graphics.graphicsenv.flags.angle_feature_overrides
Bug: 372694741
Test: aflags list | grep angle_feature_overrides
Test: aflags enable com.android.graphics.graphicsenv.flags.angle_feature_overrides
Flag: com.android.graphics.graphicsenv.flags.angle_feature_overrides
Change-Id: Idc859b76b846901e1e763c4a994c98d050b2b4b9
diff --git a/libs/graphicsenv/GraphicsEnv.cpp b/libs/graphicsenv/GraphicsEnv.cpp
index 626581c..03e6456 100644
--- a/libs/graphicsenv/GraphicsEnv.cpp
+++ b/libs/graphicsenv/GraphicsEnv.cpp
@@ -639,7 +639,7 @@
// List of ANGLE features to override (enabled or disable).
// The list of overrides is loaded and parsed by GpuService.
void GraphicsEnv::updateAngleFeatureOverrides() {
- if (!graphicsenv_flags::feature_overrides()) {
+ if (!graphicsenv_flags::angle_feature_overrides()) {
return;
}
@@ -654,7 +654,7 @@
void GraphicsEnv::getAngleFeatureOverrides(std::vector<const char*>& enabled,
std::vector<const char*>& disabled) {
- if (!graphicsenv_flags::feature_overrides()) {
+ if (!graphicsenv_flags::angle_feature_overrides()) {
return;
}
diff --git a/libs/graphicsenv/graphicsenv_flags.aconfig b/libs/graphicsenv/graphicsenv_flags.aconfig
index ac66362..efa4bca 100644
--- a/libs/graphicsenv/graphicsenv_flags.aconfig
+++ b/libs/graphicsenv/graphicsenv_flags.aconfig
@@ -2,8 +2,8 @@
container: "system"
flag {
- name: "feature_overrides"
- namespace: "core_graphics"
- description: "This flag controls the Feature Overrides in GraphicsEnv."
+ name: "angle_feature_overrides"
+ namespace: "gpu"
+ description: "This flag controls the ANGLE Feature Overrides in GraphicsEnv."
bug: "372694741"
}
diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp
index 0dd9f19..efc34f6 100644
--- a/opengl/libs/EGL/egl_display.cpp
+++ b/opengl/libs/EGL/egl_display.cpp
@@ -146,7 +146,7 @@
}
}
- if (graphicsenv_flags::feature_overrides()) {
+ if (graphicsenv_flags::angle_feature_overrides()) {
// Get the list of ANGLE features to enable from Global.Settings.
const auto& eglFeatures = GraphicsEnv::getInstance().getAngleEglFeatures();
for (const std::string& eglFeature : eglFeatures) {
diff --git a/services/gpuservice/GpuService.cpp b/services/gpuservice/GpuService.cpp
index 25ee21f..46327df 100644
--- a/services/gpuservice/GpuService.cpp
+++ b/services/gpuservice/GpuService.cpp
@@ -147,7 +147,7 @@
}
FeatureOverrides GpuService::getFeatureOverrides() {
- if (!graphicsenv_flags::feature_overrides()) {
+ if (!graphicsenv_flags::angle_feature_overrides()) {
FeatureOverrides featureOverrides;
return featureOverrides;
}
@@ -183,7 +183,7 @@
ALOGV(" arg[%zu]: '%s'", i, String8(args[i]).c_str());
if (!args.empty()) {
- if (graphicsenv_flags::feature_overrides()) {
+ if (graphicsenv_flags::angle_feature_overrides()) {
if (args[0] == String16("featureOverrides"))
return cmdFeatureOverrides(out, err);
}
@@ -267,7 +267,7 @@
"GPU Service commands:\n"
" vkjson dump Vulkan properties as JSON\n"
" vkprofiles print support for select Vulkan profiles\n");
- if (graphicsenv_flags::feature_overrides()) {
+ if (graphicsenv_flags::angle_feature_overrides()) {
fprintf(outs,
" featureOverrides update and output gpuservice's feature overrides\n");
}