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

Commit a36ad821 authored by Alex Light's avatar Alex Light Committed by Automerger Merge Worker
Browse files

Merge "Revert "Delete atoms.proto from statsd"" am: 3f89c81e am: 88a7e658 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1510215

Change-Id: I61fe2fc2ffe4f2fd9efb24e67a4a3e91858fcac4
parents db5a1c06 88a7e658

Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -812,17 +812,13 @@ java_library_host { 
    name: "platformprotos",

    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_internal_protos",

        "cmds/am/proto/instrumentation_data.proto",

        "cmds/statsd/src/**/*.proto",

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

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

    ],

    proto: {

        include_dirs: [

            "external/protobuf/src",

            "frameworks/proto_logging/stats",

        ],

        include_dirs: ["external/protobuf/src"],

        type: "full",

    },

    errorprone: {

cmds/statsd/Android.bp

+36 −15
Original line number Diff line number Diff line
@@ -14,6 +14,34 @@ 
// limitations under the License.

//



// ==========================================================

// Build the library for use on the host

// ==========================================================

cc_library_host_shared {

    name: "libstats_proto_host",

    srcs: [

        "src/atoms.proto",

        "src/atom_field_options.proto",

    ],



    shared_libs: [

        "libplatformprotos",

    ],



    proto: {

        type: "full",

        export_proto_headers: true,

        include_dirs: [

            "external/protobuf/src",

        ],

    },



    export_shared_lib_headers: [

        "libplatformprotos",

    ]



}



cc_defaults {

    name: "statsd_defaults",
@@ -247,8 +275,9 @@ cc_test { 
        // atom_field_options.proto needs field_options.proto, but that is

        // not included in libprotobuf-cpp-lite, so compile it here.

        ":libprotobuf-internal-protos",

        ":libstats_internal_protos",



        "src/atom_field_options.proto",

        "src/atoms.proto",

        "src/shell/shell_data.proto",

        "src/stats_log.proto",

        "tests/AlarmMonitor_test.cpp",
@@ -312,10 +341,7 @@ cc_test { 


    proto: {

        type: "lite",

        include_dirs: [

            "external/protobuf/src",

            "frameworks/proto_logging/stats",

        ],

        include_dirs: ["external/protobuf/src"],

    },



}
@@ -332,7 +358,6 @@ cc_benchmark { 
        // atom_field_options.proto needs field_options.proto, but that is

        // not included in libprotobuf-cpp-lite, so compile it here.

        ":libprotobuf-internal-protos",

        ":libstats_internal_protos",



        "benchmark/duration_metric_benchmark.cpp",

        "benchmark/filter_value_benchmark.cpp",
@@ -342,15 +367,14 @@ cc_benchmark { 
        "benchmark/main.cpp",

        "benchmark/metric_util.cpp",

        "benchmark/stats_write_benchmark.cpp",

        "src/atom_field_options.proto",

        "src/atoms.proto",

        "src/stats_log.proto",

    ],



    proto: {

        type: "lite",

        include_dirs: [

            "external/protobuf/src",

            "frameworks/proto_logging/stats",

        ],

        include_dirs: ["external/protobuf/src"],

    },



    cflags: [
@@ -382,14 +406,11 @@ java_library { 
    sdk_version: "core_current",

    proto: {

        type: "lite",

        include_dirs: [

            "external/protobuf/src",

            "frameworks/proto_logging/stats",

        ],

        include_dirs: ["external/protobuf/src"],

    },



    srcs: [

        ":libstats_atoms_proto",

        "src/atoms.proto",

        "src/shell/shell_config.proto",

        "src/shell/shell_data.proto",

        "src/stats_log.proto",

cmds/statsd/src/shell/shell_data.proto

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ package android.os.statsd; 
option java_package = "com.android.os.statsd";

option java_outer_classname = "ShellDataProto";



import "frameworks/proto_logging/stats/atoms.proto";

import "frameworks/base/cmds/statsd/src/atoms.proto";



// The output of shell subscription, including both pulled and pushed subscriptions.

message ShellData {

cmds/statsd/src/stats_log.proto

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ package android.os.statsd; 
option java_package = "com.android.os";

option java_outer_classname = "StatsLog";



import "frameworks/proto_logging/stats/atoms.proto";

import "frameworks/base/cmds/statsd/src/atoms.proto";



message DimensionsValue {

  optional int32 field = 1;

cmds/statsd/tests/LogEvent_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#include <gtest/gtest.h>



#include "frameworks/base/cmds/statsd/src/atoms.pb.h"

#include "frameworks/base/core/proto/android/stats/launcher/launcher.pb.h"

#include "frameworks/proto_logging/stats/atoms.pb.h"

#include "log/log_event_list.h"

#include "stats_event.h"