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

Commit 57fcd0e5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Support new socket schema in native codegen"

parents 742715cf 4fdc7fd3

tools/stats_log_api_gen/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ cc_binary_host { 
        "java_writer.cpp",

        "java_writer_q.cpp",

        "main.cpp",

        "native_writer.cpp",

        "native_writer_q.cpp",

        "utils.cpp",

    ],

    cflags: [

tools/stats_log_api_gen/atoms_info_writer.h

+1 −2
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ namespace stats_log_api_gen { 
using namespace std;



int write_atoms_info_cpp(FILE* out, const Atoms& atoms, const string& namespaceStr,

        const string& importHeader, const string& statslogHeader

);

        const string& importHeader, const string& statslogHeader);



int write_atoms_info_header(FILE* out, const Atoms& atoms, const string& namespaceStr);

tools/stats_log_api_gen/java_writer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -83,7 +83,9 @@ static int write_java_methods( 
        // Print method body.

        string indent("");

        if (DEFAULT_MODULE_NAME != moduleName) {

            fprintf(out, "        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {\n");

            // TODO(b/146235828): Use just SDK_INT check once it is incremented from Q.

            fprintf(out, "        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q ||\n");

            fprintf(out, "                Build.VERSION.CODENAME.equals(\"R\")) {\n");

            indent = "    ";

        }

tools/stats_log_api_gen/java_writer.h

+1 −2
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ using namespace std; 


int write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl &attributionDecl,

                                    const string& moduleName, const string& javaClass,

                                    const string& javaPackage

);

                                    const string& javaPackage);



}  // namespace stats_log_api_gen

}  // namespace android

tools/stats_log_api_gen/java_writer_q.h

+5 −7
Original line number Diff line number Diff line
@@ -37,21 +37,19 @@ int write_java_methods_q_schema( 
        const map<vector<java_type_t>, set<string>>& signatures_to_modules,

        const AtomDecl &attributionDecl,

        const string& moduleName,

        const string& indent

);

        const string& indent);



void write_java_helpers_for_q_schema_methods(

        FILE * out,

        const AtomDecl &attributionDecl,

        const int requiredHelpers,

        const string& indent

);

        const string& indent);



#if defined(STATS_SCHEMA_LEGACY)

int write_stats_log_java_q(FILE* out, const Atoms& atoms, const AtomDecl &attributionDecl);



int write_stats_log_java_q_for_module(FILE* out, const Atoms& atoms, const AtomDecl &attributionDecl,

                                    const string& moduleName, const string& javaClass,

int write_stats_log_java_q_for_module(FILE* out, const Atoms& atoms,

        const AtomDecl &attributionDecl, const string& moduleName, const string& javaClass,

        const string& javaPackage);

#endif

}  // namespace stats_log_api_gen