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

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

Merge "Add cc_defaults wrapper for android.hardware.graphics.allocator ndk... 

Merge "Add cc_defaults wrapper for android.hardware.graphics.allocator ndk package." am: a92da637 am: 52d1bd22

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



Change-Id: I792a2e3431b64446da3ebd857836d4f7f718ba2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d7a2710 52d1bd22

graphics/Android.bp

0 → 100644
+59 −0
Original line number Diff line number Diff line 
// Copyright (C) 2022 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 {

    default_applicable_licenses: ["hardware_interfaces_license"],

}



cc_defaults {

    name: "android.hardware.graphics.allocator-ndk_static",

    static_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.allocator-ndk_shared",

    shared_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.common-ndk_static",

    static_libs: [

        "android.hardware.graphics.common-V3-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.common-ndk_shared",

    shared_libs: [

        "android.hardware.graphics.common-V3-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_static",

    static_libs: [

        "android.hardware.graphics.composer3-V1-ndk",

    ],

}



cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_shared",

    shared_libs: [

        "android.hardware.graphics.composer3-V1-ndk",

    ],

}

graphics/allocator/aidl/vts/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ cc_test { 
    name: "VtsHalGraphicsAllocatorAidl_TargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "android.hardware.graphics.allocator-ndk_shared",

        "use_libaidlvintf_gtest_helper_static",

        "hwui_defaults",

    ],
@@ -35,8 +36,6 @@ cc_test { 
    ],



    shared_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.common-V3-ndk",

        "android.hardware.graphics.mapper@4.0",

        "libEGL",

        "libGLESv2",

graphics/composer/2.1/utils/vts/Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -25,14 +25,16 @@ package { 


cc_library_static {

    name: "android.hardware.graphics.composer@2.1-vts",

    defaults: ["hidl_defaults"],

    defaults: [

        "android.hardware.graphics.allocator-ndk_static",

        "hidl_defaults",

    ],

    srcs: [

        "ComposerVts.cpp",

        "GraphicsComposerCallback.cpp",

        "TestCommandReader.cpp",

    ],

    static_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.composer@2.1",

        "android.hardware.graphics.mapper@2.0-vts",

        "android.hardware.graphics.mapper@3.0-vts",
@@ -40,7 +42,6 @@ cc_library_static { 
        "libgtest",

    ],

    export_static_lib_headers: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.composer@2.1",

        "android.hardware.graphics.mapper@2.0-vts",

        "android.hardware.graphics.mapper@3.0-vts",

graphics/composer/2.1/vts/functional/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ package { 


cc_test {

    name: "VtsHalGraphicsComposerV2_1TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    defaults: [

        "VtsHalTargetTestDefaults",

        "android.hardware.graphics.allocator-ndk_static",

    ],

    tidy_timeout_srcs: ["VtsHalGraphicsComposerV2_1TargetTest.cpp"],

    srcs: ["VtsHalGraphicsComposerV2_1TargetTest.cpp"],
@@ -42,7 +45,6 @@ cc_test { 
        "android.hardware.graphics.mapper@4.0",

    ],

    static_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.allocator@2.0",

        "android.hardware.graphics.allocator@3.0",

        "android.hardware.graphics.allocator@4.0",

graphics/composer/2.2/utils/vts/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -25,7 +25,11 @@ package { 


cc_library_static {

    name: "android.hardware.graphics.composer@2.2-vts",

    defaults: ["hidl_defaults"],

    defaults: [

        "android.hardware.graphics.allocator-ndk_static",

        "android.hardware.graphics.composer3-ndk_static",

        "hidl_defaults",

    ],

    srcs: [

        "ComposerVts.cpp",

        "ReadbackVts.cpp",
@@ -35,7 +39,6 @@ cc_library_static { 
        "libui",

    ],

    static_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.composer@2.1-vts",

        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.composer3-V1-ndk",
@@ -53,7 +56,6 @@ cc_library_static { 
        "android.hardware.graphics.mapper@4.0-vts",

    ],

    export_static_lib_headers: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.composer@2.1-vts",

        "android.hardware.graphics.composer@2.2",

        "android.hardware.graphics.mapper@2.1-vts",