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

Commit 289fdbc7 authored by Yiwei Zhang's avatar Yiwei Zhang
Browse files

SF TimeStats: update build file and some cleanups

Remove the redundant part in the Android.bp file, and at the same time
remove some unused code.

Test: dumpsys SurfaceFlinger --timestats <see go/sf-timestats for args>
Bug: b/70388650
Change-Id: I5ddd63234780f4f482c4628de173ac6167b628f5
parent edb393d1
Loading
Loading
Loading
Loading
+6 −28
Original line number Diff line number Diff line
cc_library_shared {
    name: "libtimestats_proto",
    vendor_available: true,
    export_include_dirs: ["include"],

    srcs: [
@@ -9,11 +8,8 @@ cc_library_shared {
    ],

    shared_libs: [
        "android.hardware.graphics.common@1.1",
        "libui",
        "libprotobuf-cpp-lite",
        "libbase",
        "liblog",
        "libprotobuf-cpp-lite",
    ],

    proto: {
@@ -22,34 +18,16 @@ cc_library_shared {

    cppflags: [
        "-Werror",
        "-Wno-unused-parameter",
        "-Wno-format",
        "-Wno-c++98-compat-pedantic",
        "-Wno-float-conversion",
        "-Wno-disabled-macro-expansion",
        "-Wno-float-conversion",
        "-Wno-float-equal",
        "-Wno-sign-conversion",
        "-Wno-padded",
        "-Wno-format",
        "-Wno-old-style-cast",
        "-Wno-padded",
        "-Wno-sign-conversion",
        "-Wno-undef",
        "-Wno-unused-parameter",
    ],

}

java_library_static {
    name: "timestatsprotosnano",
    host_supported: true,
    proto: {
        type: "nano",
    },
    srcs: ["*.proto"],
    no_framework_libs: true,
    target: {
        android: {
            jarjar_rules: "jarjar-rules.txt",
        },
        host: {
            static_libs: ["libprotobuf-java-nano"],
        },
    },
}
+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@

#include <timestatsproto/TimeStatsProtoHeader.h>

#include <math/vec4.h>

#include <memory>
#include <string>
#include <unordered_map>
#include <vector>
+0 −1
Original line number Diff line number Diff line
rule com.google.protobuf.nano.** com.android.framework.protobuf.nano.@1
+0 −4
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ package android.surfaceflinger;

option optimize_for = LITE_RUNTIME;

// frameworks/base/core/proto/android/service/sftimestats.proto is based on
// this proto. Please only make valid protobuf changes to these messages, and
// keep the other file in sync with this one.

message SFTimeStatsGlobalProto {
  // The start & end timestamps in UTC as
  // milliseconds since January 1, 1970