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

Commit d6393758 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "118395019: Hide constants and methods in StatsLogInternal" 

am: 0a5f2637

Change-Id: Iffaea9ca3f9a2c0d5685e4ea27e618e9c01211c6
parents 314a2396 0a5f2637

tools/stats_log_api_gen/main.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -705,6 +705,7 @@ static void write_java_method( 
    const AtomDecl &attributionDecl) {

    const AtomDecl &attributionDecl) {

    for (set<vector<java_type_t>>::const_iterator signature = signatures.begin();

    for (set<vector<java_type_t>>::const_iterator signature = signatures.begin();

        signature != signatures.end(); signature++) {

        signature != signatures.end(); signature++) {

        fprintf(out, "    /** @hide */\n");

        fprintf(out, "    public static native int %s(int code", method_name.c_str());

        fprintf(out, "    public static native int %s(int code", method_name.c_str());

        int argIndex = 1;

        int argIndex = 1;

        for (vector<java_type_t>::const_iterator arg = signature->begin();

        for (vector<java_type_t>::const_iterator arg = signature->begin();
@@ -748,6 +749,7 @@ static void write_java_work_source_method(FILE* out, const set<vector<java_type_ 
        }

        }





        // Method header (signature)

        // Method header (signature)

        fprintf(out, "    /** @hide */\n");

        fprintf(out, "    public static void write(int code");

        fprintf(out, "    public static void write(int code");

        int argIndex = 1;

        int argIndex = 1;

        for (vector<java_type_t>::const_iterator arg = signature->begin();

        for (vector<java_type_t>::const_iterator arg = signature->begin();
@@ -827,6 +829,7 @@ write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl &attributionD 
        if (non_chained_decl != atom_code_to_non_chained_decl_map.end()) {

        if (non_chained_decl != atom_code_to_non_chained_decl_map.end()) {

            write_java_usage(out, "write_non_chained", constant, *non_chained_decl->second);

            write_java_usage(out, "write_non_chained", constant, *non_chained_decl->second);

        }

        }

        fprintf(out, "     * @hide\n");

        fprintf(out, "     */\n");

        fprintf(out, "     */\n");

        fprintf(out, "    public static final int %s = %d;\n", constant.c_str(), atom->code);

        fprintf(out, "    public static final int %s = %d;\n", constant.c_str(), atom->code);

    }

    }
@@ -843,6 +846,7 @@ write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl &attributionD 
                    field->name.c_str());

                    field->name.c_str());

                for (map<int, string>::const_iterator value = field->enumValues.begin();

                for (map<int, string>::const_iterator value = field->enumValues.begin();

                    value != field->enumValues.end(); value++) {

                    value != field->enumValues.end(); value++) {

                    fprintf(out, "    /** @hide */\n");

                    fprintf(out, "    public static final int %s__%s__%s = %d;\n",

                    fprintf(out, "    public static final int %s__%s__%s = %d;\n",

                        make_constant_name(atom->message).c_str(),

                        make_constant_name(atom->message).c_str(),

                        make_constant_name(field->name).c_str(),

                        make_constant_name(field->name).c_str(),