Skip to content

Commit 9ba4ce6

Browse files
hoxyqmeta-codesync[bot]
authored andcommitted
Cleanup no longer used jni layer for frame timings (facebook#54678)
Summary: Pull Request resolved: facebook#54678 # Changelog: [Internal] This is not a breaking change, since it removes something that wasn't yet rolled out to OSS - it is unused. Reviewed By: sbuggay Differential Revision: D87378393 fbshipit-source-id: 3d560276d029cdab942e76fe34111d63e453a26c
1 parent 26ff069 commit 9ba4ce6

File tree

9 files changed

+1
-128
lines changed

9 files changed

+1
-128
lines changed

packages/react-native/ReactAndroid/api/ReactAndroid.api

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3162,7 +3162,6 @@ public final class com/facebook/react/soloader/OpenSourceMergedSoMapping : com/f
31623162
public final fun libreact_devsupportjni_so ()I
31633163
public final fun libreact_featureflagsjni_so ()I
31643164
public final fun libreact_newarchdefaults_so ()I
3165-
public final fun libreact_performancetracerjni_so ()I
31663165
public final fun libreactnative_so ()I
31673166
public final fun libreactnativeblob_so ()I
31683167
public final fun libreactnativejni_common_so ()I

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/inspector/FrameTimingsObserver.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import android.os.Process
1414
import android.view.FrameMetrics
1515
import android.view.Window
1616
import com.facebook.proguard.annotations.DoNotStripAny
17-
import com.facebook.soloader.SoLoader
1817

1918
@DoNotStripAny
2019
internal class FrameTimingsObserver(
@@ -24,8 +23,6 @@ internal class FrameTimingsObserver(
2423
private val handler = Handler(Looper.getMainLooper())
2524
private var frameCounter: Int = 0
2625

27-
private external fun setLayerTreeId(frame: String, layerTreeId: Int)
28-
2926
private val frameMetricsListener =
3027
Window.OnFrameMetricsAvailableListener { _, frameMetrics, _dropCount ->
3128
val beginDrawingTimestamp = frameMetrics.getMetric(FrameMetrics.INTENDED_VSYNC_TIMESTAMP)
@@ -66,13 +63,4 @@ internal class FrameTimingsObserver(
6663
window.removeOnFrameMetricsAvailableListener(frameMetricsListener)
6764
handler.removeCallbacksAndMessages(null)
6865
}
69-
70-
private companion object {
71-
init {
72-
SoLoader.loadLibrary("react_devsupportjni")
73-
}
74-
75-
@JvmStatic
76-
private external fun reportFrameTiming(frame: Int, paintStartNanos: Long, paintEndNanos: Long)
77-
}
7866
}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/soloader/OpenSourceMergedSoMapping.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
2828
"react_devsupportjni",
2929
"react_featureflagsjni",
3030
"react_newarchdefaults",
31-
"react_performancetracerjni",
3231
"reactnativeblob",
3332
"reactnativejni",
3433
"reactnativejni_common",
@@ -58,7 +57,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
5857
"react_devsupportjni" -> libreact_devsupportjni_so()
5958
"react_featureflagsjni" -> libreact_featureflagsjni_so()
6059
"react_newarchdefaults" -> libreact_newarchdefaults_so()
61-
"react_performancetracerjni" -> libreact_performancetracerjni_so()
6260
"reactnative" -> libreactnative_so()
6361
"reactnativeblob" -> libreactnativeblob_so()
6462
"reactnativejni" -> libreactnativejni_so()
@@ -90,8 +88,6 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
9088

9189
public external fun libreact_newarchdefaults_so(): Int
9290

93-
public external fun libreact_performancetracerjni_so(): Int
94-
9591
public external fun libreactnative_so(): Int
9692

9793
public external fun libreactnativeblob_so(): Int

packages/react-native/ReactAndroid/src/main/jni/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ add_react_android_subdir(src/main/jni/react/runtime/cxxreactpackage)
155155
add_react_android_subdir(src/main/jni/react/runtime/jni)
156156
add_react_android_subdir(src/main/jni/react/runtime/hermes/jni)
157157
add_react_android_subdir(src/main/jni/react/devsupport)
158-
add_react_android_subdir(src/main/jni/react/tracing)
159158

160159
# SoMerging Utils
161160
include(${REACT_ANDROID_DIR}/src/main/jni/first-party/jni-lib-merge/SoMerging-utils.cmake)

packages/react-native/ReactAndroid/src/main/jni/react/devsupport/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ target_include_directories(react_devsupportjni PUBLIC .)
2020
target_link_libraries(react_devsupportjni
2121
fbjni
2222
jsinspector
23-
jsinspector_tracing
24-
react_networking
25-
react_timing)
23+
react_networking)
2624

2725
target_compile_reactnative_options(react_devsupportjni PRIVATE)

packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JFrameTiming.cpp

Lines changed: 0 additions & 46 deletions
This file was deleted.

packages/react-native/ReactAndroid/src/main/jni/react/devsupport/JFrameTiming.h

Lines changed: 0 additions & 32 deletions
This file was deleted.

packages/react-native/ReactAndroid/src/main/jni/react/devsupport/OnLoad.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include "JCxxInspectorPackagerConnection.h"
99
#include "JCxxInspectorPackagerConnectionWebSocketDelegate.h"
10-
#include "JFrameTiming.h"
1110
#include "JInspectorFlags.h"
1211
#include "JInspectorNetworkReporter.h"
1312

@@ -19,7 +18,6 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) {
1918
registerNatives();
2019
facebook::react::jsinspector_modern::
2120
JCxxInspectorPackagerConnectionWebSocketDelegate::registerNatives();
22-
facebook::react::jsinspector_modern::JFrameTiming::registerNatives();
2321
facebook::react::jsinspector_modern::JInspectorFlags::registerNatives();
2422
facebook::react::jsinspector_modern::JInspectorNetworkReporter::
2523
registerNatives();

packages/react-native/ReactAndroid/src/main/jni/react/tracing/CMakeLists.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)