Revert "Android Java SDK: test that we can use @CriticalNative."

This reverts commit 0665c31. Reason for revert: AOSP build failure Change-Id: Ibd19375ce605df27e84eede166fe6d7e281ca737
google · Feb 27, 2025 · 7fb4fcc · 7fb4fcc
1 parent 0665c31
commit 7fb4fcc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 50 deletions.
diff --git a/src/java_sdk/main/cpp/com_google_perfetto_sdk_PerfettoExampleWrapper.cc b/src/java_sdk/main/cpp/com_google_perfetto_sdk_PerfettoExampleWrapper.cc
@@ -22,7 +22,8 @@
 
 #include "src/java_sdk/main/cpp/example.h"
 
-static jint Java_com_google_perfetto_sdk_PerfettoExampleWrapper_runPerfettoMain(
+JNIEXPORT jint JNICALL
+Java_com_google_perfetto_sdk_PerfettoExampleWrapper_runPerfettoMain(
     JNIEnv* env,
     jobject /*thiz*/,
     jstring outputFilePath) {
@@ -31,38 +32,3 @@ static jint Java_com_google_perfetto_sdk_PerfettoExampleWrapper_runPerfettoMain(
   env->ReleaseStringUTFChars(outputFilePath, cstr);
   return run_main(file_path);
 }
-
-static jint
-Java_com_google_perfetto_sdk_PerfettoExampleWrapper_incrementIntCritical(
-    jint value) {
-  return value + 1;
-}
-
-static const JNINativeMethod myMethods[] = {
-    {"runPerfettoMain", "(Ljava/lang/String;)I",
-     reinterpret_cast<void*>(
-         Java_com_google_perfetto_sdk_PerfettoExampleWrapper_runPerfettoMain)},
-    {"incrementIntCritical", "(I)I",
-     reinterpret_cast<void*>(
-         Java_com_google_perfetto_sdk_PerfettoExampleWrapper_incrementIntCritical)}};
-
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) {
-  JNIEnv* env;
-  if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
-    return JNI_ERR;
-  }
-
-  jclass myCls =
-      env->FindClass("com/google/perfetto/sdk/PerfettoExampleWrapper");
-  if (myCls == nullptr) {
-    return JNI_ERR;
-  }
-
-  int rc = env->RegisterNatives(myCls, myMethods,
-                                sizeof(myMethods) / sizeof(JNINativeMethod));
-  if (rc != JNI_OK) {
-    return JNI_ERR;
-  }
-
-  return JNI_VERSION_1_6;
-}
diff --git a/src/java_sdk/main/cpp/com_google_perfetto_sdk_PerfettoExampleWrapper.h b/src/java_sdk/main/cpp/com_google_perfetto_sdk_PerfettoExampleWrapper.h
@@ -14,16 +14,24 @@
  * limitations under the License.
  */
 
-#ifndef SRC_JAVA_SDK_MAIN_CPP_COM_GOOGLE_PERFETTO_SDK_PERFETTOEXAMPLEWRAPPER_H_
-#define SRC_JAVA_SDK_MAIN_CPP_COM_GOOGLE_PERFETTO_SDK_PERFETTOEXAMPLEWRAPPER_H_
-
+/* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
+/* Header for class com_example_android_bazel_PerfettoExampleWrapper */
 
+#ifndef SRC_JAVA_SDK_MAIN_CPP_COM_GOOGLE_PERFETTO_SDK_PERFETTOEXAMPLEWRAPPER_H_
+#define SRC_JAVA_SDK_MAIN_CPP_COM_GOOGLE_PERFETTO_SDK_PERFETTOEXAMPLEWRAPPER_H_
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*);
+/*
+ * Class:     com_google_perfetto_sdk_PerfettoExampleWrapper
+ * Method:    runPerfettoMain
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL
+Java_com_google_perfetto_sdk_PerfettoExampleWrapper_runPerfettoMain(JNIEnv*,
+                                                                    jobject,
+                                                                    jstring);
 
 #ifdef __cplusplus
 }

diff --git a/src/java_sdk/main/java/com/google/perfetto/sdk/PerfettoExampleWrapper.java b/src/java_sdk/main/java/com/google/perfetto/sdk/PerfettoExampleWrapper.java
@@ -16,8 +16,6 @@
 
 package com.google.perfetto.sdk;
 
-import dalvik.annotation.optimization.CriticalNative;
-
 public class PerfettoExampleWrapper {
 
     static {
@@ -29,7 +27,4 @@ public static int doRunPerfettoMain(String outputFilePath) {
     }
 
     private native int runPerfettoMain(String outputFilePath);
-
-    @CriticalNative
-    public static native int incrementIntCritical(int value);
 }
diff --git a/src/java_sdk/test/java/com/google/perfetto/sdk/test/SimpleInstrumentationTest.java b/src/java_sdk/test/java/com/google/perfetto/sdk/test/SimpleInstrumentationTest.java
@@ -46,9 +46,5 @@ public void testDoRunPerfettoMain() {
         Assert.assertEquals(0, perfettoResult);
         Assert.assertTrue(perfettoOutput.exists());
         Assert.assertTrue(perfettoOutput.length() > 0);
-
-        int criticalValuePlusOne = PerfettoExampleWrapper.incrementIntCritical(10);
-        Log.i(TAG, "criticalValuePlusOne: " + criticalValuePlusOne);
-        Assert.assertEquals(11, criticalValuePlusOne);
     }
 }