Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f39f1a7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert android.hardware.graphics.composer@2.2-service to soong" into... 

Merge "Convert android.hardware.graphics.composer@2.2-service to soong" into main am: cbca4fe9 am: f47a3b90

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3271712



Change-Id: I56f1714d6e87973fcf24c7126af9791b31a098eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e0e6f11f f47a3b90

graphics/composer/2.2/default/Android.bp

0 → 100644
+51 −0
Original line number Diff line number Diff line 
// 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",

    ],

}

graphics/composer/2.2/default/Android.mk

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
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)