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

Commit c503c417 authored by Jiwen Cai's avatar Jiwen Cai Committed by Android (Google) Code Review
Browse files

Merge changes Ie10034db,I26ba18f2 

* changes:
  Update buffer_transport_benchmark to use DVR API
  Build libbufferhubqueue and libpdx_default_transport as shared library
parents 339ae912 bd21fca7

cmds/atrace/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ cc_binary { 
        "libcutils",

        "libz",

        "libbase",

    ],

    static_libs: [

        "libpdx_default_transport",

    ],

libs/gui/Android.bp

+2 −7
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ cc_library_shared { 
    shared_libs: [

        "libsync",

        "libbinder",

        "libbufferhubqueue",  // TODO(b/70046255): Remove this once BufferHub is integrated into libgui.

        "libpdx_default_transport",

        "libcutils",

        "libEGL",

        "libGLESv2",
@@ -135,13 +137,6 @@ cc_library_shared { 
        "android.hardware.configstore-utils",

    ],



    // TODO(b/70046255): Remove these once BufferHub is integrated into libgui.

    static_libs: [

        "libbufferhub",

        "libbufferhubqueue",

        "libpdx_default_transport",

    ],



    header_libs: [

        "libdvr_headers",

        "libnativebase_headers",

libs/vr/libbufferhub/Android.bp

+3 −7
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ localIncludeFiles = [ 
    "include",

]



staticLibraries = [

    "libpdx_default_transport",

]



sharedLibraries = [

    "libbase",

    "libbinder",
@@ -34,7 +30,8 @@ sharedLibraries = [ 
    "liblog",

    "libui",

    "libutils",

    "libnativewindow"

    "libnativewindow",

    "libpdx_default_transport",

]



headerLibraries = [
@@ -52,7 +49,6 @@ cc_library { 
        "-Werror",

    ],

    export_include_dirs: localIncludeFiles,

    static_libs: staticLibraries,

    shared_libs: sharedLibraries,

    header_libs: headerLibraries,

    name: "libbufferhub",
@@ -68,7 +64,7 @@ cc_library { 
cc_test {

    tags: ["optional"],

    srcs: ["buffer_hub-test.cpp"],

    static_libs: ["libbufferhub"] + staticLibraries,

    static_libs: ["libbufferhub"],

    shared_libs: sharedLibraries,

    header_libs: headerLibraries,

    name: "buffer_hub-test",

libs/vr/libbufferhubqueue/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ includeFiles = [ 


staticLibraries = [

    "libbufferhub",

    "libpdx_default_transport",

]



sharedLibraries = [
@@ -34,6 +33,7 @@ sharedLibraries = [ 
    "liblog",

    "libui",

    "libutils",

    "libpdx_default_transport",

]



headerLibraries = [
@@ -41,7 +41,7 @@ headerLibraries = [ 
    "libnativebase_headers",

]



cc_library {

cc_library_shared {

    name: "libbufferhubqueue",

    cflags: [

        "-DLOG_TAG=\"libbufferhubqueue\"",
@@ -65,4 +65,4 @@ cc_library { 
    },

}



subdirs = ["tests"]
 
subdirs = ["benchmarks", "tests"]

libs/vr/libbufferhubqueue/benchmarks/Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line 


cc_benchmark {

    srcs: ["buffer_transport_benchmark.cpp"],

    shared_libs: [

        "libbase",

        "libbinder",

        "libcutils",

        "libdvr",

        "libgui",

        "liblog",

        "libhardware",

        "libui",

        "libutils",

        "libnativewindow",

        "libbufferhubqueue",

        "libpdx_default_transport",

    ],

    cflags: [

        "-DLOG_TAG=\"buffer_transport_benchmark\"",

        "-DTRACE=0",

        "-O2",

        "-Wall",

        "-Werror",

    ],

    name: "buffer_transport_benchmark",

    tags: ["optional"],

}