Merge "Remove core-simple and other unnecessary things"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 993d1df..746bbb8 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -54,6 +54,16 @@
$(call add-clean-step, rm -rf $(OUT_DIR)/host/common/obj/JAVA_LIBRARIES/core*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core*)
$(call add-clean-step, rm -rf $(OUT_DIR)/host/common/obj/JAVA_LIBRARIES/core*)
+
+# Remove core-simple bootclasspath artifacts
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/framework/*core-simple*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/framework/*/*core-simple*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*core-simple*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*/*core-simple*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*/*core-simple*)
+$(call add-clean-step, touch -c $(OUT_DIR)/host/linux-x86/bin/dex2oat)
+$(call add-clean-step, touch -c $(OUT_DIR)/host/linux-x86/bin/dex2oatd)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index e4639a2..968072b 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -98,7 +98,6 @@
":conscrypt_java_files",
":core_oj_api_files",
":core_libart_api_files",
- ":core_simple_java_files",
":okhttp_api_files",
":openjdk_mmodule_extra_files",
],
@@ -143,7 +142,6 @@
srcs: [
":core_oj_java_files",
":core_libart_java_files",
- ":core_simple_java_files",
":openjdk_lambda_stub_files",
],
@@ -367,7 +365,6 @@
libs: [
"core-oj",
"core-libart",
- "core-simple",
"bouncycastle",
"conscrypt",
"okhttp",
diff --git a/luni/src/main/java/libcore/mmodule/libart/DemoLibartClass.java b/luni/src/main/java/libcore/mmodule/libart/DemoLibartClass.java
deleted file mode 100644
index 360d2035ce..0000000
--- a/luni/src/main/java/libcore/mmodule/libart/DemoLibartClass.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2018 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 libcore.mmodule.libart;
-
-import libcore.mmodule.simple.DemoSimpleClass;
-
-/**
- * A class that provides:
- * <ul>
- * <li>A method within core-libart for the core-simple mmodule to depend on,
- * and a method that depends on the core-simple mmodule thereby demonstrating a
- * bi-directional, intra-module dependency.</li>
- * <li>A "core platform API" method for use by higher-level code.</li>
- * </ul>
- *
- * @hide
- */
-@libcore.api.CorePlatformApi
-@libcore.api.IntraCoreApi
-public class DemoLibartClass {
-
- private DemoLibartClass() {}
-
- /**
- * A method that depends on the simple mmodule to work.
- */
- @libcore.api.IntraCoreApi
- public static String intraCoreDependencyMethod() {
- // Delegate to core-simple code to implement the method.
- return DemoSimpleClass.simpleMethod();
- }
-
- /**
- * A simple method that has no native or data file dependencies but is part of the intra-core
- * mmodule API contract.
- */
- @libcore.api.IntraCoreApi
- public static String simpleMethod() {
- return "Hello World";
- }
-
- /**
- * A core platform API method provided to higher-level code in the Android software stack.
- */
- @libcore.api.CorePlatformApi
- public static String corePlatformApiMethod() {
- return "Hello World";
- }
-
- /**
- * A method that is public but not part of either the intra-core or core platform API
- * contracts, i.e. it cannot be used from the rest of the platform or another core mmodule.
- */
- public static String hiddenMethod() {
- return "Hello World";
- }
-}
diff --git a/mmodules/core_platform_api/Android.bp b/mmodules/core_platform_api/Android.bp
index 29cfb2a..84f97b9 100644
--- a/mmodules/core_platform_api/Android.bp
+++ b/mmodules/core_platform_api/Android.bp
@@ -67,20 +67,3 @@
],
}
-// Tests associated with the core platform APIs.
-java_test {
- name: "core-platform-api-test",
- srcs: [ "src/test/java/**/*.java" ],
-
- no_standard_libs: true,
- libs: [
- // We depend on stubs not the impl code. We do not test
- // internals, just the {public SDK + core platform} APIs.
- "core.platform.api.stubs",
- // Other deps needed for tests.
- "junit",
- ],
- system_modules: "core-platform-api-stubs-system-modules",
-}
-
-
diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
index 7c045b5..004a298 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -1089,14 +1089,6 @@
}
-package libcore.mmodule.libart {
-
- public class DemoLibartClass {
- method public static java.lang.String corePlatformApiMethod();
- }
-
-}
-
package libcore.net {
public class InetAddressUtils {
diff --git a/mmodules/core_platform_api/src/test/java/libcore/test/coreplatformapi/DemoLibartCorePlatformApiTest.java b/mmodules/core_platform_api/src/test/java/libcore/test/coreplatformapi/DemoLibartCorePlatformApiTest.java
deleted file mode 100644
index bc4265c..0000000
--- a/mmodules/core_platform_api/src/test/java/libcore/test/coreplatformapi/DemoLibartCorePlatformApiTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2018 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 libcore.test.coreplatformapi;
-
-import static org.junit.Assert.assertEquals;
-
-import libcore.mmodule.libart.DemoLibartClass;
-
-import org.junit.Test;
-
-/**
- * A test of the behavior of {@link DemoLibartClass} core platform API methods.
- */
-public class DemoLibartCorePlatformApiTest {
-
- @Test
- public void corePlatformApiMethod() {
- assertEquals("Hello World", DemoLibartClass.corePlatformApiMethod());
- }
-}
diff --git a/mmodules/core_platform_api_client_demo/Android.bp b/mmodules/core_platform_api_client_demo/Android.bp
deleted file mode 100644
index 8aaa0c8..0000000
--- a/mmodules/core_platform_api_client_demo/Android.bp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2018 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.
-
-// A demo library that depends on core internals and acts as a stand-in
-// for rules like "framework" until we have the full Core platform API marked
-// out.
-java_library {
- name: "core_platform_api_client_demo",
- srcs: ["src/main/java/**/*.java"],
- no_framework_libs: true,
-}
-
diff --git a/mmodules/core_platform_api_client_demo/src/main/java/com/android/coreplatformapiclient/DemoCorePlatformApiClientClass.java b/mmodules/core_platform_api_client_demo/src/main/java/com/android/coreplatformapiclient/DemoCorePlatformApiClientClass.java
deleted file mode 100644
index 6e6d83b..0000000
--- a/mmodules/core_platform_api_client_demo/src/main/java/com/android/coreplatformapiclient/DemoCorePlatformApiClientClass.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2018 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 com.android.coreplatformapiclient;
-
-import libcore.mmodule.libart.DemoLibartClass;
-
-/**
- * A class that uses "core API" and can be used to test framework build rule changes.
- */
-public class DemoCorePlatformApiClientClass {
-
- public static void callingPublicApi() {
- new Object();
- }
-
- public static void callingCorePlatformApi() {
- DemoLibartClass.corePlatformApiMethod();
-
- // This is an example of a method that is not in the public SDK or core API so will fail
- // compilation if the build is doing things correctly.
- // Byte.toHexString((byte) 8, true);
- }
-}
diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt
index 9f083fc..e4be4ce 100644
--- a/mmodules/intracoreapi/api/intra/current-api.txt
+++ b/mmodules/intracoreapi/api/intra/current-api.txt
@@ -497,24 +497,6 @@
}
-package libcore.mmodule.libart {
-
- public class DemoLibartClass {
- method public static java.lang.String intraCoreDependencyMethod();
- method public static java.lang.String simpleMethod();
- }
-
-}
-
-package libcore.mmodule.simple {
-
- public class DemoSimpleClass {
- method public static java.lang.String intraCoreDependencyMethod();
- method public static java.lang.String simpleMethod();
- }
-
-}
-
package libcore.net {
public abstract class NetworkSecurityPolicy {
diff --git a/mmodules/libart_oj/Android.bp b/mmodules/libart_oj/Android.bp
deleted file mode 100644
index ce80d06..0000000
--- a/mmodules/libart_oj/Android.bp
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (C) 2018 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.
-
-// This build file handles the logical unit that is the combined "core-libart"
-// + "core-oj" jars. These two jars will always be shipped as a unit but are
-// kept separate on device for licensing reasons. Because they will be shipped
-// together we can consider them as a unit and we don't need a well-defined
-// intra-core API between them.
-
-// Tests associated with the {core-libart + core-oj} intra-core APIs.
-java_test {
- name: "core-libart+oj-intra-test",
- srcs: [ "src/test/java/**/*.java" ],
-
- no_standard_libs: true,
- libs: [
- // We depend on stubs not the impl code. We do not test
- // internals, just the {public SDK + intra-core} APIs.
- "core.intra.stubs",
- // Other deps needed for tests.
- "junit",
- ],
- system_modules: "core-intra-stubs-system-modules",
-}
-
-// Generates stub source files for the {public SDK + intra-core} APIs
-// of core-libart.
-droidstubs {
- name: "core-libart+oj-intra-stubs",
- srcs: [
- ":core_libart_api_files",
- ":core_oj_api_files",
- ":openjdk_mmodule_extra_files",
- ],
- no_framework_libs: true,
-
- installable: false,
- args: "--hide-annotation libcore.api.Hide "
- + "--show-single-annotation libcore.api.IntraCoreApi",
- merge_inclusion_annotations_dirs: ["ojluni-annotated-mmodule-stubs"],
-}
-
-// A library containing the {public SDK + intra-core} API stubs for
-// core-libart.
-java_library {
- name: "core-libart+oj.intra.stubs",
- srcs: [":core-libart+oj-intra-stubs"],
-
- no_standard_libs: true,
- // We use core.intra.stubs here to prove that we have all the dependencies
- // needed to compile the libart intra stubs within the intra stubs, i.e.
- // there are no non-API references.
- libs: ["core.intra.stubs"],
- system_modules: "core-intra-stubs-system-modules",
- openjdk9: {
- javacflags: ["--patch-module=java.base=."],
- },
-}
diff --git a/mmodules/libart_oj/src/test/java/libcore/test/mmodule/libart/DemoLibartClassTest.java b/mmodules/libart_oj/src/test/java/libcore/test/mmodule/libart/DemoLibartClassTest.java
deleted file mode 100644
index 76c28d8..0000000
--- a/mmodules/libart_oj/src/test/java/libcore/test/mmodule/libart/DemoLibartClassTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2018 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 libcore.test.mmodule.libart;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import libcore.mmodule.libart.DemoLibartClass;
-
-import org.junit.Test;
-
-/**
- * A test for the presence and behavior of {@link DemoLibartClass}.
- */
-public class DemoLibartClassTest {
-
- @Test
- public void classLoader() {
- Class<?> clazz = DemoLibartClass.class;
- ClassLoader bootClassLoader = ClassLoader.getSystemClassLoader().getParent();
-
- // The DemoLibartClass must be loaded by the boot classloader.
- assertSame(bootClassLoader, clazz.getClassLoader());
- }
-
- @Test
- public void simpleMethod() {
- assertEquals("Hello World", DemoLibartClass.simpleMethod());
- }
-
- @Test
- public void intraCoreDependencyMethod() {
- assertEquals("Hello World", DemoLibartClass.intraCoreDependencyMethod());
- }
-}
diff --git a/mmodules/simple/Android.bp b/mmodules/simple/Android.bp
deleted file mode 100644
index 0036c972..0000000
--- a/mmodules/simple/Android.bp
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (C) 2018 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.
-
-filegroup {
- name: "core_simple_java_files",
- srcs: ["src/main/java/**/*.java"]
-}
-
-java_defaults {
- name: "core-simple-defaults",
- srcs: [":core_simple_java_files"],
- installable: true,
-
- // As a logical part of the set of core libs we cannot use
- // no_standard_libs: false here because this core jar is one of the
- // default standard libs and that leads to a cycle.
- no_standard_libs: true,
- libs: ["core.intra.stubs"],
- system_modules: "core-intra-stubs-system-modules",
- openjdk9: {
- javacflags: ["--patch-module=java.base=."],
- },
-
- dxflags: ["--core-library"],
-}
-
-// A library containing the implementation of core-simple.
-java_library {
- name: "core-simple",
- hostdex: true,
- defaults: ["core-simple-defaults"],
- java_version: "1.9",
-}
-
-// A guaranteed unstripped version of core-simple.
-// The build system may or may not strip the core-simple jar
-// but this will not be stripped. See b/24535627.
-java_library {
- name: "core-simple-testdex",
- defaults: ["core-simple-defaults"],
- dex_preopt: {
- enabled: false,
- },
- java_version: "1.9",
-}
-
-// Tests associated with the core-simple intra-core APIs.
-java_test {
- name: "core-simple-intra-test",
- srcs: [ "src/test/java/**/*.java" ],
-
- no_standard_libs: true,
- libs: [
- // We depend on stubs not the impl code. We do not test
- // internals, just the {public SDK + intra-core} APIs.
- "core.intra.stubs",
- // Other deps needed for tests.
- "junit",
- ],
- system_modules: "core-intra-stubs-system-modules",
-}
-
-// Generates stub source files for the {public SDK + intra-core} APIs
-// of core-simple.
-droidstubs {
- name: "core-simple-intra-stubs",
- srcs: [":core_simple_java_files"],
- no_framework_libs: true,
-
- installable: false,
- args: "--show-single-annotation libcore.api.IntraCoreApi",
-
- api_filename: "api.txt",
- removed_api_filename: "removed.txt",
- previous_api: "previous.txt",
- check_api: {
- current: {
- api_file: "api/intra/current-api.txt",
- removed_api_file: "api/intra/current-removed.txt",
- },
- last_released: {
- api_file: "api/intra/last-api.txt",
- removed_api_file: "api/intra/last-removed.txt",
- },
- },
- java_version: "1.9",
-}
-
-// A library containing the {public SDK + intra-core} API stubs for
-// core-simple.
-java_library {
- name: "core-simple.intra.stubs",
- srcs: [":core-simple-intra-stubs"],
-
- no_standard_libs: true,
- // We use core.intra.stubs here to prove that we have all the dependencies
- // needed to compile the simple intra stubs within the intra stubs, i.e.
- // there are no non-API references.
- libs: ["core.intra.stubs"],
- system_modules: "core-intra-stubs-system-modules",
- openjdk9: {
- javacflags: ["--patch-module=java.base=."],
- },
- java_version: "1.9",
-}
diff --git a/mmodules/simple/api/intra/current-api.txt b/mmodules/simple/api/intra/current-api.txt
deleted file mode 100644
index 6aa0d7a..0000000
--- a/mmodules/simple/api/intra/current-api.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-package libcore.mmodule.simple {
-
- public class DemoSimpleClass {
- method public static java.lang.String intraCoreDependencyMethod();
- method public static java.lang.String simpleMethod();
- }
-
-}
-
diff --git a/mmodules/simple/api/intra/current-removed.txt b/mmodules/simple/api/intra/current-removed.txt
deleted file mode 100644
index e69de29..0000000
--- a/mmodules/simple/api/intra/current-removed.txt
+++ /dev/null
diff --git a/mmodules/simple/api/intra/last-api.txt b/mmodules/simple/api/intra/last-api.txt
deleted file mode 100644
index 6aa0d7a..0000000
--- a/mmodules/simple/api/intra/last-api.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-package libcore.mmodule.simple {
-
- public class DemoSimpleClass {
- method public static java.lang.String intraCoreDependencyMethod();
- method public static java.lang.String simpleMethod();
- }
-
-}
-
diff --git a/mmodules/simple/api/intra/last-removed.txt b/mmodules/simple/api/intra/last-removed.txt
deleted file mode 100644
index e69de29..0000000
--- a/mmodules/simple/api/intra/last-removed.txt
+++ /dev/null
diff --git a/mmodules/simple/src/main/java/libcore/mmodule/simple/DemoSimpleClass.java b/mmodules/simple/src/main/java/libcore/mmodule/simple/DemoSimpleClass.java
deleted file mode 100644
index a6bf475..0000000
--- a/mmodules/simple/src/main/java/libcore/mmodule/simple/DemoSimpleClass.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2018 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 libcore.mmodule.simple;
-
-import libcore.mmodule.libart.DemoLibartClass;
-
-/**
- * A class that nothing in libcore or the Android framework depends on to provide public SDK
- * behavior. It is intended for use in a fake installable mmodule. Its presence can be tested for,
- * the classloader identified and its behavior modified over time to simulate real mmodule code,
- * without touching any "real" platform logic.
- *
- * @hide
- */
-@libcore.api.IntraCoreApi
-public class DemoSimpleClass {
-
- private DemoSimpleClass() {}
-
- /**
- * A simple method that has no native or data file dependencies but is part of the simple
- * mmodule's API contract.
- */
- @libcore.api.IntraCoreApi
- public static String simpleMethod() {
- return "Hello World";
- }
-
- /**
- * A method that depends on another part of the core libraries to work.
- */
- @libcore.api.IntraCoreApi // Exposed for tests
- public static String intraCoreDependencyMethod() {
- // Delegate to core-libart code to implement the method.
- return DemoLibartClass.simpleMethod();
- }
-
- /**
- * A method that is public but not part of the simple mmodule's API contract.
- */
- public static String hiddenMethod() {
- return "Hello World";
- }
-}
diff --git a/mmodules/simple/src/test/java/libcore/test/mmodule/simple/DemoSimpleClassTest.java b/mmodules/simple/src/test/java/libcore/test/mmodule/simple/DemoSimpleClassTest.java
deleted file mode 100644
index 523eed5..0000000
--- a/mmodules/simple/src/test/java/libcore/test/mmodule/simple/DemoSimpleClassTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2018 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 libcore.test.mmodule.simple;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import libcore.mmodule.simple.DemoSimpleClass;
-
-import org.junit.Test;
-
-/**
- * A test for the presence and behavior of {@link DemoSimpleClass}.
- */
-public class DemoSimpleClassTest {
-
- @Test
- public void classLoader() {
- Class<?> clazz = DemoSimpleClass.class;
- ClassLoader bootClassLoader = ClassLoader.getSystemClassLoader().getParent();
-
- // The DemoSimpleClass must be loaded by the boot classloader.
- assertSame(bootClassLoader, clazz.getClassLoader());
- }
-
- @Test
- public void simpleMethod() {
- assertEquals("Hello World", DemoSimpleClass.simpleMethod());
- }
-
- @Test
- public void intraCoreDependencyMethod() {
- assertEquals("Hello World", DemoSimpleClass.intraCoreDependencyMethod());
- }
-}
diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index f31bca0..c341043 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -176,7 +176,6 @@
"luni/src/main/java/libcore/io/Os.java",
"luni/src/main/java/libcore/io/SizeOf.java",
"luni/src/main/java/libcore/io/Streams.java",
- "luni/src/main/java/libcore/mmodule/libart/DemoLibartClass.java",
"luni/src/main/java/libcore/net/InetAddressUtils.java",
"luni/src/main/java/libcore/net/MimeUtils.java",
"luni/src/main/java/libcore/net/NetworkSecurityPolicy.java",
diff --git a/ojluni/src/test/artrun b/ojluni/src/test/artrun
index d56753d..e9afd78 100755
--- a/ojluni/src/test/artrun
+++ b/ojluni/src/test/artrun
@@ -103,7 +103,6 @@
conscrypt-hostdex.jar
core-ojtests-hostdex.jar # This is the *one* addition that makes our OJ tests actually run. The rest of these are standard jars on the bootclasspath.
core-oj-hostdex.jar
-core-simple-hostdex.jar
okhttp-hostdex.jar)
BOOT_DEXJAR_PREFIX="$ANDROID_ROOT/framework"
