Test1963: remove unnecessary JNI.

Other CTS tests already require a working memfd_create(), and ART is no longer running tests locally on fugu (whose ancient kernel didn't support memfd_create()).

Change-Id: If442de7f62a3b2a38206223f15fdb2f62429523d

3 files changed, 0 insertions, 74 deletions

diff --git a/test/1963-add-to-dex-classloader-in-memory/check_memfd_create.cc b/test/1963-add-to-dex-classloader-in-memory/check_memfd_create.cc
deleted file mode 100644
index 70a64d71ee..0000000000
--- a/test/1963-add-to-dex-classloader-in-memory/check_memfd_create.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <string>
-#include <iostream>
-#include <sstream>
-
-#include "jvmti.h"
-
-#include "base/logging.h"
-#include "base/globals.h"
-#include "base/memfd.h"
-
-#ifdef __linux__
-#include <sys/utsname.h>
-#endif
-
-namespace art {
-namespace Test1963AddToDexClassLoaderInMemory {
-
-extern "C" JNIEXPORT jboolean JNICALL Java_Main_hasWorkingMemfdCreate(JNIEnv*, jclass) {
-  // We should always have a working version if we're on normal buildbots.
-  if (!art::kIsTargetBuild) {
-    return true;
-  }
-#ifdef __linux__
-  struct utsname name;
-  if (uname(&name) >= 0) {
-    std::istringstream version(name.release);
-    std::string major_str;
-    std::string minor_str;
-    std::getline(version, major_str, '.');
-    std::getline(version, minor_str, '.');
-    int major = std::stoi(major_str);
-    int minor = std::stoi(minor_str);
-    if (major >= 4 || (major == 3 && minor >= 17)) {
-      // memfd_create syscall was added in 3.17
-      return true;
-    }
-  }
-#endif
-  int res = memfd_create_compat("TEST THAT MEMFD CREATE WORKS", 0);
-  if (res < 0) {
-    PLOG(ERROR) << "Unable to call memfd_create_compat successfully!";
-    return false;
-  } else {
-    close(res);
-    return true;
-  }
-}
-
-}  // namespace Test1963AddToDexClassLoaderInMemory
-}  // namespace art
diff --git a/test/1963-add-to-dex-classloader-in-memory/src/Main.java b/test/1963-add-to-dex-classloader-in-memory/src/Main.java
index 1825e4faab..9c4cf57739 100644
--- a/test/1963-add-to-dex-classloader-in-memory/src/Main.java
+++ b/test/1963-add-to-dex-classloader-in-memory/src/Main.java
@@ -17,16 +17,10 @@
 public class Main {
   public static void main(String[] args) throws Exception {
     try {
-      if (!hasWorkingMemfdCreate()) {
-        System.out.println("---NO memfd_create---");
-      }
       art.Test1963.run();
     } catch (Throwable t) {
       System.out.println(t);
       t.printStackTrace(System.out);
-      return;
     }
   }
-
-  public static native boolean hasWorkingMemfdCreate();
 }
diff --git a/test/Android.bp b/test/Android.bp
index 63840648ca..d3084fe7d2 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -725,7 +725,6 @@ art_cc_defaults {
         "1959-redefine-object-instrument/fake_redef_object.cc",
         "1960-obsolete-jit-multithread-native/native_say_hi.cc",
         "1964-add-to-dex-classloader-file/add_to_loader.cc",
-        "1963-add-to-dex-classloader-in-memory/check_memfd_create.cc",
         "2012-structural-redefinition-failures-jni-id/set-jni-id-used.cc",
         "2031-zygote-compiled-frame-deopt/native-wait.cc",
         "2038-hiddenapi-jvmti-ext/hiddenapi_ext.cc",