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

Commit 1b5692ea authored by Peiyong Lin's avatar Peiyong Lin
Browse files

[Cleanup] Properly export lib headers. 

Properly export lib headers to avoid copying everything when upgrade composer
version. Minor: Remove VTS team as OWNERS of non-VTS directory.

BUG: 135929065
Test: build and boot
Change-Id: I4c3544490fcf043ff6bda2312a00aed015d0d5fc
parent d42be6dc

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

+9 −0
Original line number Diff line number Diff line
@@ -28,9 +28,18 @@ cc_library_static { 
        "android.hardware.graphics.mapper@2.0-vts",

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

    ],

    export_static_lib_headers: [

        "VtsHalHidlTargetTestBase",

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

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

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

    ],

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

    ],

    export_header_lib_headers: [

        "android.hardware.graphics.composer@2.1-command-buffer",

    ],

    cflags: [

        "-O0",

        "-g",

graphics/composer/2.2/utils/OWNERS

+0 −4
Original line number Diff line number Diff line
@@ -3,7 +3,3 @@ courtneygo@google.com 
lpy@google.com

stoza@google.com

vhau@google.com
 


# VTS team

yim@google.com

zhuoyao@google.com

graphics/composer/2.2/utils/command-buffer/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -3,11 +3,16 @@ cc_library_headers { 
    defaults: ["hidl_defaults"],

    vendor_available: true,

    shared_libs: [

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

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

    ],

    export_shared_lib_headers: [

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

    ],

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

    ],

    export_header_lib_headers: [

        "android.hardware.graphics.composer@2.1-command-buffer",

    ],

    export_include_dirs: ["include"],

}

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

+7 −10
Original line number Diff line number Diff line
@@ -26,28 +26,25 @@ cc_library_static { 
        "libui",

    ],

    static_libs: [

        "librenderengine",

        "libmath",

        "libarect",

        "libnativewindow",

        "VtsHalHidlTargetTestBase",

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

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

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

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

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

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

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

        "libarect",

        "libmath",

        "libnativewindow",

        "librenderengine",

    ],

    export_static_lib_headers: [

        "VtsHalHidlTargetTestBase",

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

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

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

    ],

    header_libs: [

        "android.hardware.graphics.composer@2.1-command-buffer",

        "android.hardware.graphics.composer@2.2-command-buffer",

    ],

    export_header_lib_headers: [

        "android.hardware.graphics.composer@2.1-command-buffer",

        "android.hardware.graphics.composer@2.2-command-buffer",

    ],

    cflags: [

graphics/composer/2.3/utils/OWNERS

+0 −4
Original line number Diff line number Diff line
@@ -2,7 +2,3 @@ 
lpy@google.com

stoza@google.com

vhau@google.com
 


# VTS team

yim@google.com

zhuoyao@google.com