From 035900982fdf9effbb5f4dee18b7133f34f6f909 Mon Sep 17 00:00:00 2001 From: Dominik Behr Date: Wed, 18 Jun 2025 15:37:51 -0700 Subject: [PATCH] remove mediatek suffix entries Everything now builds under the same minigbm name for all platforms. Bug: 388092228 Test: Boot corsola to desktop Flag: EXEMPT: desktop-only change Change-Id: I00708383151f832bcccec1aad8091f422dfcf2c3 --- Android.bp | 7 ------ cros_gralloc/gralloc4/Android.bp | 16 ------------- ....allocator@4.0-service.minigbm_mediatek.rc | 24 ------------------- 3 files changed, 47 deletions(-) delete mode 100644 cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_mediatek.rc diff --git a/Android.bp b/Android.bp index cfca5ba..fff7961 100644 --- a/Android.bp +++ b/Android.bp @@ -331,10 +331,3 @@ cc_library_shared { defaults: ["minigbm_cros_gralloc0_defaults"], shared_libs: ["libminigbm_gralloc_arcvm"], } - -// mediatek -cc_library_shared { - name: "libminigbm_gralloc_mediatek", - defaults: ["minigbm_cros_gralloc_library_defaults"], - cflags: mediatek_cflags, -} diff --git a/cros_gralloc/gralloc4/Android.bp b/cros_gralloc/gralloc4/Android.bp index 432a89d..73588f7 100644 --- a/cros_gralloc/gralloc4/Android.bp +++ b/cros_gralloc/gralloc4/Android.bp @@ -126,14 +126,6 @@ cc_binary { }, } -cc_binary { - name: "android.hardware.graphics.allocator@4.0-service.minigbm_mediatek", - defaults: ["minigbm_gralloc4_allocator_defaults"], - shared_libs: ["libminigbm_gralloc_mediatek"], - vintf_fragment_modules: ["android.hardware.graphics.allocator@4.0.xml"], - init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_mediatek.rc"], -} - vintf_fragment { name: "android.hardware.graphics.mapper@4.0.xml", src: "android.hardware.graphics.mapper@4.0.xml", @@ -180,11 +172,3 @@ cc_library_shared { }, }, } - -cc_library_shared { - name: "android.hardware.graphics.mapper@4.0-impl.minigbm_mediatek", - defaults: ["minigbm_gralloc4_common_defaults"], - shared_libs: ["libminigbm_gralloc_mediatek"], - vintf_fragment_modules: ["android.hardware.graphics.mapper@4.0.xml"], - srcs: [":minigbm_gralloc4_mapper_files"], -} diff --git a/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_mediatek.rc b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_mediatek.rc deleted file mode 100644 index d8d87fd..0000000 --- a/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_mediatek.rc +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright 2025 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -service vendor.graphics.allocator-4-0 /vendor/bin/hw/android.hardware.graphics.allocator@4.0-service.minigbm_mediatek - interface android.hardware.graphics.allocator@4.0::IAllocator default - class hal animation - user system - group graphics drmrpc - capabilities SYS_NICE - onrestart restart surfaceflinger - task_profiles ServiceCapacityLow