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

Commit 3b2e4214 authored by Matt Buckley's avatar Matt Buckley Committed by Android (Google) Code Review
Browse files

Merge "Remove FrameTimeline module and build FrameTimeline.cpp with SF" into main

parents c2e1ba6a 3495323f

services/surfaceflinger/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,6 @@ cc_defaults { 
        "iinputflinger_aidl_lib_static",

        "iinputflinger_aidl_lib_static",

        "libaidlcommonsupport",

        "libaidlcommonsupport",

        "libcompositionengine",

        "libcompositionengine",

        "libframetimeline",

        "libgui_aidl_static",

        "libgui_aidl_static",

        "libperfetto_client_experimental",

        "libperfetto_client_experimental",

        "librenderengine",

        "librenderengine",
@@ -208,6 +207,7 @@ filegroup { 
        "DisplayDevice.cpp",

        "DisplayDevice.cpp",

        "Effects/Daltonizer.cpp",

        "Effects/Daltonizer.cpp",

        "FpsReporter.cpp",

        "FpsReporter.cpp",

        "FrameTimeline/FrameTimeline.cpp",

        "FrameTracer/FrameTracer.cpp",

        "FrameTracer/FrameTracer.cpp",

        "FrameTracker.cpp",

        "FrameTracker.cpp",

        "FrontEnd/LayerCreationArgs.cpp",

        "FrontEnd/LayerCreationArgs.cpp",

services/surfaceflinger/FrameTimeline/Android.bp

deleted100644 → 0
+0 −35
Original line number Original line Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_native_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

    default_team: "trendy_team_android_core_graphics_stack",

}



cc_library_static {

    name: "libframetimeline",

    defaults: ["surfaceflinger_defaults"],

    srcs: [

        "FrameTimeline.cpp",

    ],

    header_libs: [

        "libscheduler_headers",

    ],

    shared_libs: [

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

        "libbase",

        "libcutils",

        "liblog",

        "libgui",

        "libtimestats",

        "libui",

        "libutils",

    ],

    static_libs: [

        "libperfetto_client_experimental",

        "libsurfaceflinger_common",

    ],

    export_include_dirs: ["."],

}

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ 




#include "DisplayDevice.h"

#include "DisplayDevice.h"

#include "DisplayHardware/HWComposer.h"

#include "DisplayHardware/HWComposer.h"

#include "FrameTimeline.h"

#include "FrameTimeline/FrameTimeline.h"

#include "FrameTracer/FrameTracer.h"

#include "FrameTracer/FrameTracer.h"

#include "FrontEnd/LayerCreationArgs.h"

#include "FrontEnd/LayerCreationArgs.h"

#include "FrontEnd/LayerHandle.h"

#include "FrontEnd/LayerHandle.h"

services/surfaceflinger/Scheduler/EventThread.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include <common/FlagManager.h>

#include <common/FlagManager.h>

#include <scheduler/FrameRateMode.h>

#include <scheduler/FrameRateMode.h>

#include <scheduler/VsyncConfig.h>

#include <scheduler/VsyncConfig.h>

#include "FrameTimeline.h"

#include "FrameTimeline/FrameTimeline.h"

#include "VSyncDispatch.h"

#include "VSyncDispatch.h"





#include "EventThread.h"

#include "EventThread.h"

services/surfaceflinger/Scheduler/MessageQueue.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <scheduler/interface/ICompositor.h>

#include <scheduler/interface/ICompositor.h>





#include "EventThread.h"

#include "EventThread.h"

#include "FrameTimeline.h"

#include "FrameTimeline/FrameTimeline.h"

#include "MessageQueue.h"

#include "MessageQueue.h"





namespace android::impl {

namespace android::impl {