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

Commit 6d9bf3e2 authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Remove native support for tracing in host runtime" into main

parents 4bde4754 ce5321e8

core/jni/Android.bp

+1 −5
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ cc_library_shared_for_libandroid_runtime { 
        "android_content_res_ApkAssets.cpp",

        "android_os_SystemClock.cpp",

        "android_os_SystemProperties.cpp",

        "android_os_Trace.cpp",

        "android_text_AndroidCharacter.cpp",

        "android_util_AssetManager.cpp",

        "android_util_EventLog.cpp",
@@ -104,10 +103,6 @@ cc_library_shared_for_libandroid_runtime { 
        "system/media/private/camera/include",

    ],



    shared_libs: [

        "libtracing_perfetto",

    ],



    static_libs: [

        "libziparchive_for_incfs",

        "libguiflags",
@@ -190,6 +185,7 @@ cc_library_shared_for_libandroid_runtime { 
                "android_os_ServiceManagerNative.cpp",

                "android_os_SharedMemory.cpp",

                "android_os_storage_StorageManager.cpp",

                "android_os_Trace.cpp",

                "android_os_UEventObserver.cpp",

                "android_os_incremental_IncrementalManager.cpp",

                "android_net_LocalSocketImpl.cpp",

core/jni/platform/host/HostRuntime.cpp

+0 −2
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ extern int register_android_os_MessageQueue(JNIEnv* env); 
extern int register_android_os_Parcel(JNIEnv* env);

extern int register_android_os_SystemClock(JNIEnv* env);

extern int register_android_os_SystemProperties(JNIEnv* env);

extern int register_android_os_Trace(JNIEnv* env);

extern int register_android_text_AndroidCharacter(JNIEnv* env);

extern int register_android_util_EventLog(JNIEnv* env);

extern int register_android_util_Log(JNIEnv* env);
@@ -133,7 +132,6 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = { 
#endif

        {"android.os.SystemClock", REG_JNI(register_android_os_SystemClock)},

        {"android.os.SystemProperties", REG_JNI(register_android_os_SystemProperties)},

        {"android.os.Trace", REG_JNI(register_android_os_Trace)},

        {"android.text.AndroidCharacter", REG_JNI(register_android_text_AndroidCharacter)},

        {"android.util.EventLog", REG_JNI(register_android_util_EventLog)},

        {"android.util.Log", REG_JNI(register_android_util_Log)},