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

Commit 21afa376 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

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

parents 951ad0e1 0435c6b4

graphics/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -16,6 +16,20 @@ 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: [

graphics/allocator/aidl/vts/Android.bp

+1 −1
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,7 +36,6 @@ cc_test { 
    ],



    shared_libs: [

        "android.hardware.graphics.allocator-V1-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

+1 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ package { 
cc_library_static {

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

    defaults: [

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

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

        "hidl_defaults",

    ],
@@ -38,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.mapper@2.1-vts",
@@ -55,7 +55,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",