ANGLE: Allow libs from debug package
Add a new setting that allows a developer to specify where
to load ANGLE libraries from, rather than the default location.
This is only allowed for apps that are dumpable, i.e. can have
libraries injected. That includes debuggable, profileable,
and root.
To use the new setting:
adb shell settings put global angle_debug_package <package>
This allows a developer to build an APK directly from Chromium
and use it with a production build of Android. It will override
pre-installed system packages and updates.
Note: Use of ANGLE Developer Options UI will cease to function
until the debug package is uninstalled.
Bug: 80239516
Test: Apply setting, see new ANGLE used
Test: cts-tradefed run singleCommand cts -m CtsAngleIntegrationHostTestCases
Change-Id: Ib3b1fb52c0eb669e7ea931959a73aba2bd15bedf
diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java
index 43ac574..53503f4 100644
--- a/core/java/android/os/GraphicsEnvironment.java
+++ b/core/java/android/os/GraphicsEnvironment.java
@@ -337,6 +337,25 @@
}
/**
+ * Check for ANGLE debug package, but only for apps that can load them (dumpable)
+ */
+ private String getAngleDebugPackage(Context context, Bundle coreSettings) {
+ final boolean appIsDebuggable = isDebuggable(context);
+ final boolean appIsProfileable = isProfileable(context);
+ final boolean deviceIsDebuggable = getCanLoadSystemLibraries() == 1;
+ if (appIsDebuggable || appIsProfileable || deviceIsDebuggable) {
+
+ String debugPackage =
+ coreSettings.getString(Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE);
+
+ if ((debugPackage != null) && (!debugPackage.isEmpty())) {
+ return debugPackage;
+ }
+ }
+ return "";
+ }
+
+ /**
* Attempt to setup ANGLE with a temporary rules file.
* True: Temporary rules file was loaded.
* False: Temporary rules file was *not* loaded.
@@ -502,11 +521,23 @@
}
final ApplicationInfo angleInfo;
- try {
- angleInfo = pm.getApplicationInfo(anglePkgName, PackageManager.MATCH_SYSTEM_ONLY);
- } catch (PackageManager.NameNotFoundException e) {
- Log.w(TAG, "ANGLE package '" + anglePkgName + "' not installed");
- return false;
+ String angleDebugPackage = getAngleDebugPackage(context, bundle);
+ if (!angleDebugPackage.isEmpty()) {
+ Log.i(TAG, "ANGLE debug package enabled: " + angleDebugPackage);
+ try {
+ // Note the debug package does not have to be pre-installed
+ angleInfo = pm.getApplicationInfo(angleDebugPackage, 0);
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "ANGLE debug package '" + angleDebugPackage + "' not installed");
+ return false;
+ }
+ } else {
+ try {
+ angleInfo = pm.getApplicationInfo(anglePkgName, PackageManager.MATCH_SYSTEM_ONLY);
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "ANGLE package '" + anglePkgName + "' not installed");
+ return false;
+ }
}
final String abi = chooseAbi(angleInfo);
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 1cab250..8047ec6 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -12453,6 +12453,14 @@
public static final String GPU_DEBUG_APP = "gpu_debug_app";
/**
+ * Package containing ANGLE libraries other than system, which are only available
+ * to dumpable apps that opt-in.
+ * @hide
+ */
+ public static final String GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE =
+ "angle_debug_package";
+
+ /**
* Force all PKGs to use ANGLE, regardless of any other settings
* The value is a boolean (1 or 0).
* @hide
diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto
index d124feb..b47097d 100644
--- a/core/proto/android/providers/settings/global.proto
+++ b/core/proto/android/providers/settings/global.proto
@@ -455,6 +455,8 @@
optional SettingProto show_angle_in_use_dialog = 15;
// Game Driver - List of libraries in sphal accessible by Game Driver
optional SettingProto game_driver_sphal_libraries = 16;
+ // ANGLE - External package containing ANGLE libraries
+ optional SettingProto angle_debug_package = 17;
}
optional Gpu gpu = 59;
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 80250db..9484b9d 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -488,6 +488,7 @@
Settings.Global.GPU_DEBUG_APP,
Settings.Global.GPU_DEBUG_LAYERS,
Settings.Global.GPU_DEBUG_LAYERS_GLES,
+ Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE,
Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE,
Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS,
Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES,