summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yiwei Zhang <zzyiwei@google.com> 2018-11-16 16:21:35 -0800
committer android-build-merger <android-build-merger@google.com> 2018-11-16 16:21:35 -0800
commitb4bb8a834eca636c4a549d507a0d7760a341f151 (patch)
tree972ad5eba7df7ea2213d182ac31f5e8fa91eea9a
parentbb6133d55c611753c49d52507d677f5d1b1c30b3 (diff)
parent4e0f3d8b14f1344d177ff0218be59592b11cd63e (diff)
Merge "[GPU Service] Name GPU service back to "gpu"" am: fa19959795
am: 4e0f3d8b14 Change-Id: I320b370222042708c2d7f60a0f68ee335c270da9
-rw-r--r--services/gpuservice/GpuService.cpp2
-rw-r--r--services/gpuservice/gpuservice.rc2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/gpuservice/GpuService.cpp b/services/gpuservice/GpuService.cpp
index e4ca6bcc47..150896cf91 100644
--- a/services/gpuservice/GpuService.cpp
+++ b/services/gpuservice/GpuService.cpp
@@ -62,7 +62,7 @@ namespace {
status_t cmd_vkjson(int out, int err);
}
-const char* const GpuService::SERVICE_NAME = "gpuservice";
+const char* const GpuService::SERVICE_NAME = "gpu";
GpuService::GpuService() = default;
diff --git a/services/gpuservice/gpuservice.rc b/services/gpuservice/gpuservice.rc
index d23cf461f8..65a5c2776a 100644
--- a/services/gpuservice/gpuservice.rc
+++ b/services/gpuservice/gpuservice.rc
@@ -1,4 +1,4 @@
-service gpuservice /system/bin/gpuservice
+service gpu /system/bin/gpuservice
class core
user gpu_service
group graphics