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

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

Merge "GpuStats: separate stats module as a separate library"

parents ee0d6f34 baaef887

services/gpuservice/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ cc_defaults { 
        "libbase",

        "libbinder",

        "libcutils",

        "libgfxstats",

        "libgraphicsenv",

        "liblog",

        "libutils",
@@ -52,7 +53,6 @@ filegroup { 
    name: "libgpuservice_sources",

    srcs: [

        "GpuService.cpp",

        "gpustats/GpuStats.cpp"

    ],

}

services/gpuservice/GpuService.cpp

+1 −2
Original line number Diff line number Diff line
@@ -24,14 +24,13 @@ 
#include <binder/Parcel.h>

#include <binder/PermissionCache.h>

#include <cutils/properties.h>

#include <gpustats/GpuStats.h>

#include <private/android_filesystem_config.h>

#include <utils/String8.h>

#include <utils/Trace.h>



#include <vkjson.h>



#include "gpustats/GpuStats.h"



namespace android {



using base::StringAppendF;

services/gpuservice/gpustats/Android.bp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "libgfxstats",

    srcs: [

        "GpuStats.cpp",

    ],

    shared_libs: [

        "libcutils",

        "libgraphicsenv",

        "liblog",

        "libutils",

    ],

    export_include_dirs: ["include"],

    cppflags: [

        "-Wall",

        "-Werror",

        "-Wformat",

        "-Wthread-safety",

        "-Wunused",

        "-Wunreachable-code",

    ],

}

services/gpuservice/gpustats/GpuStats.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "GpuStats"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS



#include "GpuStats.h"

#include <gpustats/GpuStats.h>



#include <cutils/properties.h>

#include <log/log.h>

services/gpuservice/gpustats/GpuStats.h→services/gpuservice/gpustats/include/gpustats/GpuStats.h

+4 −4
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ 


#pragma once



#include <mutex>

#include <unordered_map>

#include <vector>



#include <graphicsenv/GpuStatsInfo.h>

#include <graphicsenv/GraphicsEnv.h>

#include <utils/String16.h>

#include <utils/Vector.h>



#include <mutex>

#include <unordered_map>

#include <vector>



namespace android {



class GpuStats {