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

Commit 2ff0a7bd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002 

* changes:
  Add --supportQ flag to java StatsLog codegen
  Support new socket schema in native codegen
  Move statsd metadata from statslog to atoms_info
  Fix StatsEvent memory usage for pulled events
parents 9e52462c 71821591

cmds/statsd/Android.bp

+58 −0
Original line number Diff line number Diff line
@@ -138,11 +138,69 @@ cc_defaults { 
        "android.hardware.power@1.1",

        "android.hardware.power.stats@1.0",

        "libpackagelistparser",

        "libstatsmetadata",

        "libsysutils",

        "libcutils",

    ],

}



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

// libstatsmetadata

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



genrule {

    name: "atoms_info.h",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --atomsInfoHeader $(genDir)/atoms_info.h",

    out: [

        "atoms_info.h",

    ],

}



genrule {

    name: "atoms_info.cpp",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --atomsInfoCpp $(genDir)/atoms_info.cpp",

    out: [

        "atoms_info.cpp",

    ],

}



cc_library_shared {

    name: "libstatsmetadata",

    host_supported: true,

    generated_sources: [

        "atoms_info.cpp",

    ],

    generated_headers: [

        "atoms_info.h",

    ],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    export_generated_headers: [

        "atoms_info.h",

    ],

    shared_libs: [

        "libcutils",

        "libstatslog",

    ],

    target: {

        android: {

            shared_libs: [

                "libutils",

            ],

        },

        host: {

            static_libs: [

                "libutils",

            ],

        },

    },

}





// =========

// statsd

// =========

cmds/statsd/src/FieldValue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include "Log.h"

#include "FieldValue.h"

#include "HashableDimensionKey.h"

#include "atoms_info.h"

#include "math.h"

#include "statslog.h"



namespace android {

namespace os {

cmds/statsd/src/StatsLogProcessor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <frameworks/base/cmds/statsd/src/active_config_list.pb.h>

#include "StatsLogProcessor.h"

#include "android-base/stringprintf.h"

#include "atoms_info.h"

#include "external/StatsPullerManager.h"

#include "guardrail/StatsdStats.h"

#include "metrics/CountMetricProducer.h"

cmds/statsd/src/external/PowerStatsPuller.cpp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <vector>



#include "PowerStatsPuller.h"

#include "statslog.h"

#include "stats_log_util.h"



using android::hardware::hidl_vec;

cmds/statsd/src/external/puller_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include "Log.h"



#include "StatsPullerManager.h"

#include "atoms_info.h"

#include "puller_util.h"

#include "statslog.h"



namespace android {

namespace os {