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

Commit 123c7b83 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TimeStats: refactor libtimestats blueprint interface"

parents 9d4c996b d7927055

services/surfaceflinger/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ cc_defaults { 
        "libprocessgroup",

        "libprotobuf-cpp-lite",

        "libsync",

        "libtimestats_proto",

        "libtimestats",

        "libui",

        "libinput",

        "libutils",
@@ -70,7 +70,6 @@ cc_defaults { 
        "libperfetto_client_experimental",

        "librenderengine",

        "libserviceutils",

        "libtimestats",

        "libtrace_proto",

        "libvr_manager",

        "libvrflinger",
@@ -84,7 +83,6 @@ cc_defaults { 
        "libcompositionengine",

        "librenderengine",

        "libserviceutils",

        "libtimestats",

    ],

    export_shared_lib_headers: [

        "android.hardware.graphics.allocator@2.0",
@@ -96,6 +94,7 @@ cc_defaults { 
        "android.hardware.graphics.composer@2.4",

        "android.hardware.power@1.3",

        "libhidlbase",

        "libtimestats",

    ],

    // TODO (marissaw): this library is not used by surfaceflinger. This is here so

    // the library compiled in a way that is accessible to system partition when running
@@ -231,7 +230,6 @@ cc_defaults { 
        "liblog",

        "libprocessgroup",

        "libsync",

        "libtimestats_proto",

        "libutils",

    ],

    static_libs: [

services/surfaceflinger/CompositionEngine/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -22,14 +22,13 @@ cc_defaults { 
        "libnativewindow",

        "libprotobuf-cpp-lite",

        "libsync",

        "libtimestats_proto",

        "libtimestats",

        "libui",

        "libutils",

    ],

    static_libs: [

        "libmath",

        "librenderengine",

        "libtimestats",

        "libtrace_proto",

    ],

    header_libs: [

services/surfaceflinger/TimeStats/Android.bp

+21 −6
Original line number Diff line number Diff line 
cc_library_static {

cc_library_shared {

    name: "libtimestats",

    defaults: ["surfaceflinger_defaults"],

    srcs: [

        "TimeStats.cpp",

    ],

    export_include_dirs: ["."],

    shared_libs: [

        "libbase",

        "libcutils",

        "liblog",

        "libprotobuf-cpp-lite",

        "libtimestats_proto",

        "libui",

        "libutils",

    ],

    export_include_dirs: ["."],

    export_shared_lib_headers: [

        "libtimestats_proto",

    ],

    cppflags: [

        "-Wall",

        "-Werror",

        "-Wformat",

        "-Wthread-safety",

        "-Wunused",

        "-Wunreachable-code",

    ],

}

services/surfaceflinger/tests/Android.bp

+6 −8
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ cc_test { 
        "liblog",

        "libnativewindow",

        "libprotobuf-cpp-full",

        "libtimestats_proto",

        "libui",

        "libutils",

    ],
@@ -98,7 +97,6 @@ cc_test { 
        "liblayers_proto",

        "liblog",

        "libprotobuf-cpp-full",

        "libtimestats_proto",

        "libui",

        "libutils",

    ],

services/surfaceflinger/tests/fakehwc/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ cc_test { 
        "liblog",

        "libnativewindow",

        "libsync",

        "libtimestats_proto",

        "libtimestats",

        "libui",

        "libutils",

    ],
@@ -38,7 +38,6 @@ cc_test { 
        "libgmock",

        "libperfetto_client_experimental",

        "librenderengine",

        "libtimestats",

        "libtrace_proto",

    ],

    header_libs: [