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

Commit 9d3aa9ec authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Delete unused code in stats-log-api-gen" into rvc-dev am: 4341dbb2 

Change-Id: Ibb57de15c0eebb2cb5f19811b331e6b6ef9703ce
parents ddba8d83 4341dbb2

Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ filegroup { 


        // etc.

        ":framework-javastream-protos",

        ":framework-statslog-gen", // StatsLogInternal.java

        ":statslog-framework-java-gen", // FrameworkStatsLog.java



        // telephony annotations
@@ -609,13 +608,6 @@ java_library { 
    ],

}



genrule {

    name: "framework-statslog-gen",

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

    cmd: "$(location stats-log-api-gen) --java $(out) --worksource",

    out: ["android/util/StatsLogInternal.java"],

}



genrule {

    name: "statslog-framework-java-gen",

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

core/jni/Android.bp

+0 −10
Original line number Diff line number Diff line 


genrule {

    name: "android_util_StatsLogInternal.cpp",

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

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

    out: [

        "android_util_StatsLogInternal.cpp",

    ],

}



cc_library_shared {

    name: "libandroid_runtime",

    host_supported: true,
@@ -277,7 +268,6 @@ cc_library_shared { 
                // our headers include libnativewindow's public headers

                "libnativewindow",

            ],

            generated_sources: ["android_util_StatsLogInternal.cpp"],

            header_libs: ["bionic_libc_platform_headers"],

        },

        host: {

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ namespace android { 
extern int register_android_app_admin_SecurityLog(JNIEnv* env);

extern int register_android_content_AssetManager(JNIEnv* env);

extern int register_android_util_EventLog(JNIEnv* env);

extern int register_android_util_StatsLogInternal(JNIEnv* env);

extern int register_android_util_Log(JNIEnv* env);

extern int register_android_util_MemoryIntArray(JNIEnv* env);

extern int register_android_content_StringBlock(JNIEnv* env);
@@ -1435,7 +1434,6 @@ static const RegJNIRec gRegJNI[] = { 
        REG_JNI(register_android_util_EventLog),

        REG_JNI(register_android_util_Log),

        REG_JNI(register_android_util_MemoryIntArray),

        REG_JNI(register_android_util_StatsLogInternal),

        REG_JNI(register_android_app_admin_SecurityLog),

        REG_JNI(register_android_content_AssetManager),

        REG_JNI(register_android_content_StringBlock),

tools/stats_log_api_gen/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -26,11 +26,9 @@ cc_binary_host { 
        "java_writer_q.cpp",

        "main.cpp",

        "native_writer.cpp",

        "native_writer_q.cpp",

        "utils.cpp",

    ],

    cflags: [

        //"-DSTATS_SCHEMA_LEGACY",

        "-Wall",

        "-Werror",

    ],

tools/stats_log_api_gen/java_writer.cpp

+0 −6
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ static int write_java_methods( 
        }



        // Print method signature.

        if (DEFAULT_MODULE_NAME == moduleName) {

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

        }

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

        vector<java_type_t> signature = signature_to_modules_it->first;

        int argIndex = 1;
@@ -273,9 +270,6 @@ int write_stats_log_java(FILE* out, const Atoms& atoms, const AtomDecl &attribut 
    fprintf(out, "\n");

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

    fprintf(out, " * Utility class for logging statistics events.\n");

    if (DEFAULT_MODULE_NAME == moduleName) {

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

    }

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

    fprintf(out, "public class %s {\n", javaClass.c_str());