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

Commit 8b1ae3fc authored by John Reck's avatar John Reck
Browse files

Revert "Revert "Shrink surfaceflinger"" 

This reverts commit 9b240e74.

Reason for revert: Build issues should be resolved with aae69c45979dc000cd6dfb83f69e21c2d760339a and 9015e0f59b2f925711b0b55618cb065e44e627ca

Bug: 168077202
Change-Id: I2051fd4101aef5a6a0ad16c397b29d9fe9a6b8df
parent 9b240e74

services/surfaceflinger/Android.bp

+15 −23
Original line number Diff line number Diff line
@@ -186,22 +186,18 @@ filegroup { 
    ],

}



cc_library_shared {

    // Please use libsurfaceflinger_defaults to configure how the sources are

    // built, so the same settings can be used elsewhere.

    name: "libsurfaceflinger",

    defaults: ["libsurfaceflinger_production_defaults"],

    srcs: [

        ":libsurfaceflinger_sources",



        // Note: SurfaceFlingerFactory is not in the default sources so that it

        // can be easily replaced.

        "SurfaceFlingerFactory.cpp",

cc_defaults {

    name: "libsurfaceflinger_binary",

    defaults: [

        "surfaceflinger_defaults",

        "libsurfaceflinger_production_defaults",

    ],

    cflags: [

        "-DLOG_TAG=\"SurfaceFlinger\"",

        "-DUSE_VR_COMPOSER=1",

    ],

    // VrComposer is not used when building surfaceflinger for vendors

    // TODO: Is this ever built for vendors?

    target: {

        vendor: {

            cflags: [
@@ -209,15 +205,6 @@ cc_library_shared { 
            ],

        },

    },

    logtags: ["EventLog/EventLogTags.logtags"],

}



cc_defaults {

    name: "libsurfaceflinger_binary",

    defaults: ["surfaceflinger_defaults"],

    cflags: [

        "-DLOG_TAG=\"SurfaceFlinger\"",

    ],

    shared_libs: [

        "android.frameworks.displayservice@1.0",

        "android.hardware.configstore-utils",
@@ -239,12 +226,18 @@ cc_defaults { 
        "libserviceutils",

        "libtrace_proto",

    ],

    ldflags: ["-Wl,--export-dynamic"],

    logtags: ["EventLog/EventLogTags.logtags"],

}



filegroup {

    name: "surfaceflinger_binary_sources",

    srcs: ["main_surfaceflinger.cpp"],

    srcs: [

        ":libsurfaceflinger_sources",

        // Note: SurfaceFlingerFactory is not in the default sources so that it

        // can be easily replaced.

        "SurfaceFlingerFactory.cpp",

        "main_surfaceflinger.cpp"

    ],

}



cc_binary {
@@ -253,7 +246,6 @@ cc_binary { 
    init_rc: ["surfaceflinger.rc"],

    srcs: [":surfaceflinger_binary_sources"],

    shared_libs: [

        "libsurfaceflinger",

        "libSurfaceFlingerProp",

    ],

}

services/surfaceflinger/tests/unittests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ cc_test { 
    shared_libs: [

        "libprotoutil",

        "libstatssocket",

        "libsurfaceflinger",

        "libtimestats",

        "libtimestats_proto",

    ],