test: Fix 004-JniTest for javac/dx
Add 'placeholder' FastNative/CriticalNative annotations that are built
with javac, but then the class files are removed before
jar/desugar/dx/etc.
Bug: 36902714
Test: ANDROID_COMPILE_WITH_JACK=false art/test.py
Change-Id: Ia5a284c94bc4a5ae999ca7a2018b16623de8b508
diff --git a/test/004-JniTest/build b/test/004-JniTest/build
new file mode 100755
index 0000000..c8440fc
--- /dev/null
+++ b/test/004-JniTest/build
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# Copyright 2017 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.
+
+#
+# Perform a mostly normal build.
+# Since this test imports 'dalvik.annotation.optimization.FastNative' (and CriticalNative),
+# we do a bit of trickery to allow the annotations to be used at javac-compile time,
+# but remove them afterwards so it doesn't end up in the dex file.
+#
+# This enables the test to compile with vanilla RI javac and work on either ART or RI.
+#
+
+export ORIGINAL_JAVAC="$JAVAC"
+
+# Delete CriticalNative.java, FastNative.java annotations after building the .class files.
+function javac_wrapper {
+ $ORIGINAL_JAVAC "$@"
+ local stat=$?
+
+ [[ -d classes ]] && (find classes/dalvik -name '*.class' | xargs rm -rf)
+
+ return $stat
+}
+
+export -f javac_wrapper
+export JAVAC=javac_wrapper
+
+./default-build "$@"
diff --git a/test/004-JniTest/src/dalvik/annotation/optimization/CriticalNative.java b/test/004-JniTest/src/dalvik/annotation/optimization/CriticalNative.java
new file mode 100644
index 0000000..9c17337
--- /dev/null
+++ b/test/004-JniTest/src/dalvik/annotation/optimization/CriticalNative.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+package dalvik.annotation.optimization;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Placeholder for the real FastNative annotation in the Android platform.
+ *
+ * Allows the run-test to compile without an Android bootclasspath.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.METHOD)
+public @interface CriticalNative {}
diff --git a/test/004-JniTest/src/dalvik/annotation/optimization/FastNative.java b/test/004-JniTest/src/dalvik/annotation/optimization/FastNative.java
new file mode 100644
index 0000000..3a8fbb0
--- /dev/null
+++ b/test/004-JniTest/src/dalvik/annotation/optimization/FastNative.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+package dalvik.annotation.optimization;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Placeholder for the real FastNative annotation in the Android platform.
+ *
+ * Allows the run-test to compile without an Android bootclasspath.
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.METHOD)
+public @interface FastNative {}
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 4ebcaa8..a4b8be9 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -596,7 +596,6 @@
},
{
"tests": [
- "004-JniTest",
"004-NativeAllocations",
"004-ReferenceMap",
"004-StackWalk",