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

Commit f68e747e authored by Yi Jin's avatar Yi Jin
Browse files

Remove stream.proto and cpp-streaming-proto generates field name to id 

mapping by default

Test: atest incident_helper_test
Change-Id: Iab04973ea78b942e44503fcd6ae60808caf3b9e0
parent 39b4499d

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -693,7 +693,6 @@ cc_library { 
    srcs: [

        "core/proto/**/*.proto",

        "libs/incident/**/*.proto",

        "tools/streaming_proto/stream.proto",

    ],



    target: {

Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -999,7 +999,6 @@ LOCAL_PROTOC_FLAGS := \ 
    -Iexternal/protobuf/src

LOCAL_SOURCE_FILES_ALL_GENERATED := true

LOCAL_SRC_FILES := \

    tools/streaming_proto/stream.proto \

    cmds/am/proto/instrumentation_data.proto \

    $(call all-proto-files-under, core/proto) \

    $(call all-proto-files-under, libs/incident/proto) \

core/proto/android/os/cpuinfo.proto

+0 −14
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ syntax = "proto2"; 
option java_multiple_files = true;

option java_outer_classname = "CpuInfoProto";



import "frameworks/base/tools/streaming_proto/stream.proto";



package android.os;



/**
@@ -31,8 +29,6 @@ package android.os; 
message CpuInfo {



    message TaskStats {

        option (stream_proto.stream_msg).enable_fields_mapping = true;



        optional int32 total = 1;    // total number of cpu tasks

        optional int32 running = 2;  // number of running tasks

        optional int32 sleeping = 3; // number of sleeping tasks
@@ -42,8 +38,6 @@ message CpuInfo { 
    optional TaskStats task_stats = 1;



    message MemStats { // unit in kB

        option (stream_proto.stream_msg).enable_fields_mapping = true;



        optional int32 total = 1;

        optional int32 used = 2;

        optional int32 free = 3;
@@ -54,8 +48,6 @@ message CpuInfo { 
    optional MemStats swap = 3;



    message CpuUsage { // unit is percentage %

        option (stream_proto.stream_msg).enable_fields_mapping = true;



        optional int32 cpu = 1;   // 400% cpu indicates 4 cores

        optional int32 user = 2;

        optional int32 nice = 3;
@@ -70,8 +62,6 @@ message CpuInfo { 


    // Next Tag: 13

    message Task {

        option (stream_proto.stream_msg).enable_fields_mapping = true;



        optional int32 pid = 1;

        optional int32 tid = 2;

        optional string user = 3;
@@ -80,8 +70,6 @@ message CpuInfo { 
        optional float cpu = 6;     // precentage of cpu usage of the task



        enum Status {

            option (stream_proto.stream_enum).enable_enums_mapping = true;



            STATUS_UNKNOWN = 0;

            STATUS_D = 1;  // uninterruptible sleep

            STATUS_R = 2;  // running
@@ -95,8 +83,6 @@ message CpuInfo { 


        // How Android memory manager will treat the task

        enum Policy {

            option (stream_proto.stream_enum).enable_enums_mapping = true;



            POLICY_UNKNOWN = 0;

            POLICY_fg = 1;  // foreground, the name is lower case for parsing the value

            POLICY_bg = 2;  // background, the name is lower case for parsing the value

core/proto/android/os/kernelwake.proto

+0 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ syntax = "proto2"; 
option java_multiple_files = true;

option java_outer_classname = "WakeupSourcesProto";



import "frameworks/base/tools/streaming_proto/stream.proto";



package android.os;



message KernelWakeSources {
@@ -29,8 +27,6 @@ message KernelWakeSources { 


// Next Tag: 11

message WakeupSourceProto {

    option (stream_proto.stream_msg).enable_fields_mapping = true;



    // Name of the event which triggers application processor

    optional string name = 1;

core/proto/android/os/pagetypeinfo.proto

+0 −3
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ syntax = "proto2"; 
option java_multiple_files = true;

option java_outer_classname = "PageTypeInfoProto";



import "frameworks/base/tools/streaming_proto/stream.proto";



package android.os;



/*
@@ -63,7 +61,6 @@ message MigrateTypeProto { 


// Next tag: 9

message BlockProto {

    option (stream_proto.stream_msg).enable_fields_mapping = true;



    optional int32 node = 1;