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

Commit a47ad726 authored by Mike Ma's avatar Mike Ma
Browse files

Proto message for "dumpsys sensorservice --proto" 

Add SensorServiceProto for protobuf dumpsys of sensorservice. Primarily
used by incident service to capture an incident report proto.
Also add a gensrc rule to generate cpp headers of frameworks proto to
be used by native services like sensorservice. Added "static" qualifier
to a few generated fields in the header to avoid linker conflict.

Command to invoke (any of the following after lunch and env setup):
$ adb shell dumpsys sensorservice --proto
$ adb shell incident 3053
$ incident_report 3053

Bug: 146086105
Test: Execute the above commands and compare the output against dumpsys
      sensorservice

Change-Id: I282ff37bd3e845464d0693d69fc0d82943cc9855
parent bf3e4555

Android.bp

+27 −37
Original line number Diff line number Diff line
@@ -656,6 +656,33 @@ gensrcs { 
    output_extension: "srcjar",

}



gensrcs {

    name: "framework-cppstream-protos",

    depfile: true,



    tools: [

        "aprotoc",

        "protoc-gen-cppstream",

    ],



    cmd: "mkdir -p $(genDir) " +

        "&& $(location aprotoc) " +

        "  --plugin=$(location protoc-gen-cppstream) " +

        "  --dependency_out=$(depfile) " +

        "  --cppstream_out=$(genDir) " +

        "  -Iexternal/protobuf/src " +

        "  -I . " +

        "  $(in)",



    srcs: [

        ":ipconnectivity-proto-src",

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

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

    ],



    output_extension: "proto.h",

}



filegroup {

    name: "framework-annotations",

    srcs: [
@@ -1013,43 +1040,6 @@ aidl_interface { 
    },

}



gensrcs {

    name: "gen-platform-proto-constants",

    depfile: true,



    tools: [

        "aprotoc",

        "protoc-gen-cppstream",

    ],



    srcs: [

        "core/proto/android/os/backtrace.proto",

        "core/proto/android/os/batterytype.proto",

        "core/proto/android/os/cpufreq.proto",

        "core/proto/android/os/cpuinfo.proto",

        "core/proto/android/os/data.proto",

        "core/proto/android/os/kernelwake.proto",

        "core/proto/android/os/pagetypeinfo.proto",

        "core/proto/android/os/procrank.proto",

        "core/proto/android/os/ps.proto",

        "core/proto/android/os/system_properties.proto",

        "core/proto/android/util/event_log_tags.proto",

        "core/proto/android/util/log.proto",

    ],



    // Append protoc-gen-cppstream tool's PATH otherwise aprotoc can't find the plugin tool

    cmd: "mkdir -p $(genDir) " +

        "&& $(location aprotoc) " +

        "  --plugin=$(location protoc-gen-cppstream) " +

        "  --dependency_out=$(depfile) " +

        "  --cppstream_out=$(genDir) " +

        "  -Iexternal/protobuf/src " +

        "  -I . " +

        "  $(in)",



    output_extension: "proto.h",

}





subdirs = [

    "cmds/*",

cmds/incident_helper/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ cc_defaults { 
        "src/ih_util.cpp",

    ],



    generated_headers: ["gen-platform-proto-constants"],

    generated_headers: ["framework-cppstream-protos"],



    shared_libs: [

        "libbase",

cmds/incidentd/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ cc_binary { 
    ],



    local_include_dirs: ["src"],

    generated_headers: ["gen-platform-proto-constants"],

    generated_headers: ["framework-cppstream-protos"],



    proto: {

        type: "lite",
@@ -98,7 +98,7 @@ cc_test { 
    ],



    local_include_dirs: ["src"],

    generated_headers: ["gen-platform-proto-constants"],

    generated_headers: ["framework-cppstream-protos"],



    srcs: [

        "tests/**/*.cpp",

core/proto/android/os/incident.proto

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import "frameworks/base/core/proto/android/service/package.proto"; 
import "frameworks/base/core/proto/android/service/print.proto";

import "frameworks/base/core/proto/android/service/procstats.proto";

import "frameworks/base/core/proto/android/service/restricted_image.proto";

import "frameworks/base/core/proto/android/service/sensor_service.proto";

import "frameworks/base/core/proto/android/service/usb.proto";

import "frameworks/base/core/proto/android/util/event_log_tags.proto";

import "frameworks/base/core/proto/android/util/log.proto";
@@ -492,6 +493,11 @@ message IncidentProto { 
        (section).args = "contexthub --proto"

    ];



    optional android.service.SensorServiceProto sensor_service = 3053 [

        (section).type = SECTION_DUMPSYS,

        (section).args = "sensorservice --proto"

    ];



    // Reserved for OEMs.

    extensions 50000 to 100000;

}

core/proto/android/server/activitymanagerservice.proto

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import "frameworks/base/core/proto/android/content/component_name.proto"; 
import "frameworks/base/core/proto/android/content/configuration.proto";

import "frameworks/base/core/proto/android/content/intent.proto";

import "frameworks/base/core/proto/android/content/package_item_info.proto";

import "frameworks/base/core/proto/android/graphics/rect.proto";

import "frameworks/base/core/proto/android/internal/processstats.proto";

import "frameworks/base/core/proto/android/os/bundle.proto";

import "frameworks/base/core/proto/android/os/looper.proto";