Disable ANGLE rules file checking
There is still something wrong with the feature support library.
Stop loading it by default until issues can be sorted out.
Test: cts-tradefed run singleCommand cts -m CtsAngleIntegrationHostTestCases
Bug: 119305693
Bug: 119322355
Bug: 119305887
Change-Id: I98e9141f9d753449a544cdb9ea4d7f812a10c084
diff --git a/opengl/libs/EGL/Loader.cpp b/opengl/libs/EGL/Loader.cpp
index 0c43b83..e27f233 100644
--- a/opengl/libs/EGL/Loader.cpp
+++ b/opengl/libs/EGL/Loader.cpp
@@ -584,7 +584,13 @@
// The "Developer Options" value wasn't set to force the use of ANGLE. Need to temporarily
// load ANGLE and call the updatable opt-in/out logic:
- cnx->featureSo = load_angle_from_namespace("feature_support", ns);
+ // Check if ANGLE is enabled. Workaround for several bugs:
+ // b/119305693 b/119322355 b/119305887
+ // Something is not working correctly in the feature library
+ property_get("debug.angle.enable", prop, "0");
+ if (atoi(prop)) {
+ cnx->featureSo = load_angle_from_namespace("feature_support", ns);
+ }
if (cnx->featureSo) {
ALOGV("loaded ANGLE's opt-in/out logic from namespace");
use_angle = check_angle_rules(cnx->featureSo, app_name);