commit a10520d92ad590a9c1977f26358f6426090acefa
author Yuxin Hu <yuxinhu@google.com> Thu Jan 16 02:30:53 2025 +0000
committer Yuxin Hu <yuxinhu@google.com> Mon Feb 10 18:14:20 2025 -0800
tree b72c949e4eacd66a4b5430a33c9f0ad39da460c9
parent 0499b3ecb14538a426104d4622b1c42fbdef106f

Fix ANGLE Driver Setting permission on multiuser builds

Flag: com.android.frameworks.gpuservice.flags.multiuser_permission_check
Test: atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest
Bug: b/389867658
Change-Id: I761519e00a8042006c1785d70fa7244073d3533a

services/gpuservice/Android.bp

diff --git a/services/gpuservice/Android.bp b/services/gpuservice/Android.bp
index 689221f..01287b0 100644
--- a/services/gpuservice/Android.bp
+++ b/services/gpuservice/Android.bp
@@ -7,6 +7,13 @@
     default_applicable_licenses: ["frameworks_native_license"],
 }
 
+aconfig_declarations {
+    name: "gpuservice_flags",
+    package: "com.android.frameworks.gpuservice.flags",
+    container: "system",
+    srcs: ["gpuservice_flags.aconfig"],
+}
+
 cc_defaults {
     name: "gpuservice_defaults",
     cflags: [
@@ -20,6 +27,11 @@
 }
 
 cc_aconfig_library {
+    name: "gpuservice_multiuser_flags_c_lib",
+    aconfig_declarations: "gpuservice_flags",
+}
+
+cc_aconfig_library {
     name: "gpuservice_flags_c_lib",
     aconfig_declarations: "graphicsenv_flags",
 }
@@ -92,6 +104,9 @@
     srcs: [
         ":libgpuservice_sources",
     ],
+    shared_libs: [
+        "gpuservice_multiuser_flags_c_lib",
+    ],
 }
 
 cc_defaults {
@@ -126,4 +141,7 @@
     static_libs: [
         "libgpuservice",
     ],
+    shared_libs: [
+        "gpuservice_multiuser_flags_c_lib",
+    ],
 }