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

Commit f08666b8 authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Android (Google) Code Review
Browse files

Merge "Removed dependency on libstatslog" into main

parents 6c5c041e 3f2b7df8

services/surfaceflinger/Android.bp

+39 −7
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ cc_defaults { 
        "libnativewindow",

        "libprocessgroup",

        "libprotobuf-cpp-lite",

        "libstatslog_surfaceflinger",

        "libstatslog_surfaceflinger_bootstrap",

        "libsync",

        "libui",

        "libutils",
@@ -346,10 +346,10 @@ cc_library_shared { 
}



cc_library {

    name: "libstatslog_surfaceflinger",

    generated_sources: ["statslog_surfaceflinger.cpp"],

    generated_headers: ["statslog_surfaceflinger.h"],

    export_generated_headers: ["statslog_surfaceflinger.h"],

    name: "libstatslog_surfaceflinger_bootstrap",

    generated_sources: ["statslog_surfaceflinger_bootstrap.cpp"],

    generated_headers: ["statslog_surfaceflinger_bootstrap.h"],

    export_generated_headers: ["statslog_surfaceflinger_bootstrap.h"],

    shared_libs: [

        "android.os.statsbootstrap_aidl-cpp",

        "libbinder",
@@ -358,11 +358,43 @@ cc_library { 
    ],

}



genrule {

    name: "statslog_surfaceflinger_bootstrap.h",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_surfaceflinger_bootstrap.h" +

        " --module surfaceflinger --namespace android,surfaceflinger,stats --bootstrap",

    out: [

        "statslog_surfaceflinger_bootstrap.h",

    ],

}



genrule {

    name: "statslog_surfaceflinger_bootstrap.cpp",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_surfaceflinger_bootstrap.cpp" +

        " --module surfaceflinger --namespace android,surfaceflinger,stats" +

        " --importHeader statslog_surfaceflinger_bootstrap.h --bootstrap",

    out: [

        "statslog_surfaceflinger_bootstrap.cpp",

    ],

}



cc_library {

    name: "libstatslog_surfaceflinger",

    generated_sources: ["statslog_surfaceflinger.cpp"],

    generated_headers: ["statslog_surfaceflinger.h"],

    export_generated_headers: ["statslog_surfaceflinger.h"],

    shared_libs: [

        "libstatspull",

        "libstatssocket",

    ],

}



genrule {

    name: "statslog_surfaceflinger.h",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_surfaceflinger.h" +

        " --module surfaceflinger --namespace android,surfaceflinger,stats --bootstrap",

        " --module surfaceflinger --namespace android,surfaceflinger,stats",

    out: [

        "statslog_surfaceflinger.h",

    ],
@@ -373,7 +405,7 @@ genrule { 
    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_surfaceflinger.cpp" +

        " --module surfaceflinger --namespace android,surfaceflinger,stats" +

        " --importHeader statslog_surfaceflinger.h --bootstrap",

        " --importHeader statslog_surfaceflinger.h",

    out: [

        "statslog_surfaceflinger.cpp",

    ],

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
#include <renderengine/RenderEngine.h>

#include <renderengine/impl/ExternalTexture.h>

#include <scheduler/FrameTargeter.h>

#include <statslog_surfaceflinger.h>

#include <statslog_surfaceflinger_bootstrap.h>

#include <sys/types.h>

#include <ui/ColorSpace.h>

#include <ui/DebugUtils.h>

services/surfaceflinger/tests/unittests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ cc_defaults { 
        "libpowermanager",

        "libprocessgroup",

        "libprotobuf-cpp-lite",

        "libstatslog_surfaceflinger",

        "libstatslog_surfaceflinger_bootstrap",

        "libsync",

        "libtracing_perfetto",

        "libui",