Merge "Move ObjectStreamClassTest into dedicated Java 9 suite"
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 4838a11..03d84c2 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -484,6 +484,7 @@
"//frameworks/base/location/tests/locationtests",
"//frameworks/base/core/tests/coretests",
"//frameworks/base/wifi/tests",
+ "//libcore/luni/src/test/java9compatibility",
"//packages/modules/Wifi/framework/tests",
],
hostdex: true,
@@ -655,6 +656,7 @@
static_libs: [
"core-compat-test-rules",
+ "core-java-9-compatibility-tests",
"core-java-9-language-tests",
"core-java-11-language-tests",
"core-test-rules",
diff --git a/luni/src/test/java9compatibility/Android.bp b/luni/src/test/java9compatibility/Android.bp
new file mode 100644
index 0000000..1d5dab5
--- /dev/null
+++ b/luni/src/test/java9compatibility/Android.bp
@@ -0,0 +1,32 @@
+// 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.
+
+// Android tests related to compatibility with pre-Java 11 language features.
+
+java_library {
+ name: "core-java-9-compatibility-tests",
+ hostdex: true,
+ srcs: [
+ "java/**/*.java",
+ ],
+ java_version: "1.9",
+ sdk_version: "none",
+ system_modules: "core-all-system-modules",
+ static_libs: [
+ "core-test-rules",
+ "junit",
+ "junit-params",
+ ],
+ visibility: ["//libcore"],
+}
diff --git a/luni/src/test/java/libcore/java/io/ObjectStreamClassTest.java b/luni/src/test/java9compatibility/java/libcore/java/io/ObjectStreamClassTest.java
similarity index 100%
rename from luni/src/test/java/libcore/java/io/ObjectStreamClassTest.java
rename to luni/src/test/java9compatibility/java/libcore/java/io/ObjectStreamClassTest.java