From ce222a2cbc83eae8a5ed22e707b1568a1b81df17 Mon Sep 17 00:00:00 2001 From: Bill Yang Date: Thu, 19 Sep 2024 06:37:15 +0000 Subject: [PATCH] Convert android.hardware.graphics.composer@2.2-service to soong The conversion skip the if condition for TARGET_USES_DISPLAY_RENDER_INTENTS due to the cflag it set is never being used actually. Bug: 368204639 Test: m android.hardware.graphics.composer@2.2-service Change-Id: I7347fa5cef192385f94954f620bebee6a24ebb82 --- graphics/composer/2.2/default/Android.bp | 51 ++++++++++++++++++++++++ graphics/composer/2.2/default/Android.mk | 35 ---------------- 2 files changed, 51 insertions(+), 35 deletions(-) create mode 100644 graphics/composer/2.2/default/Android.bp delete mode 100644 graphics/composer/2.2/default/Android.mk diff --git a/graphics/composer/2.2/default/Android.bp b/graphics/composer/2.2/default/Android.bp new file mode 100644 index 0000000000..5753bb0861 --- /dev/null +++ b/graphics/composer/2.2/default/Android.bp @@ -0,0 +1,51 @@ +// Copyright (C) 2024 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. + +package { + // See: http://go/android-license-faq + default_applicable_licenses: [ + "hardware_interfaces_license", + ], +} + +cc_binary { + name: "android.hardware.graphics.composer@2.2-service", + vendor: true, + relative_install_path: "hw", + cflags: [ + "-Wall", + "-Werror", + "-DLOG_TAG=\"ComposerHal\"", + ], + srcs: ["service.cpp"], + init_rc: ["android.hardware.graphics.composer@2.2-service.rc"], + header_libs: ["android.hardware.graphics.composer@2.2-passthrough"], + shared_libs: [ + "android.hardware.graphics.composer@2.1", + "android.hardware.graphics.composer@2.2", + "android.hardware.graphics.composer@2.1-resources", + "android.hardware.graphics.composer@2.2-resources", + "libbase", + "libbinder", + "libcutils", + "libfmq", + "libhardware", + "libhidlbase", + "libhwc2on1adapter", + "libhwc2onfbadapter", + "liblog", + "libsync", + "libutils", + ], +} diff --git a/graphics/composer/2.2/default/Android.mk b/graphics/composer/2.2/default/Android.mk deleted file mode 100644 index 6f7ef85904..0000000000 --- a/graphics/composer/2.2/default/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.graphics.composer@2.2-service -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../NOTICE -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_CFLAGS := -Wall -Werror -DLOG_TAG=\"ComposerHal\" -LOCAL_SRC_FILES := service.cpp -LOCAL_INIT_RC := android.hardware.graphics.composer@2.2-service.rc -LOCAL_HEADER_LIBRARIES := android.hardware.graphics.composer@2.2-passthrough -LOCAL_SHARED_LIBRARIES := \ - android.hardware.graphics.composer@2.1 \ - android.hardware.graphics.composer@2.2 \ - android.hardware.graphics.composer@2.1-resources \ - android.hardware.graphics.composer@2.2-resources \ - libbase \ - libbinder \ - libcutils \ - libfmq \ - libhardware \ - libhidlbase \ - libhwc2on1adapter \ - libhwc2onfbadapter \ - liblog \ - libsync \ - libutils - -ifdef TARGET_USES_DISPLAY_RENDER_INTENTS -LOCAL_CFLAGS += -DUSES_DISPLAY_RENDER_INTENTS -endif - -include $(BUILD_EXECUTABLE)