Remove dependency of some libcore modules on framework libraries.
Namely modules "core-tests", "core-ojtests", and
"core-ojtests-public".
This dependency breaks builds using the master-art manifest.
Test: Rely on the ART Buildbot
Change-Id: I26fcce6b500da777a7c3bfb1f69631cc277b7936
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 295b09f..7df0d7f 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -311,6 +311,7 @@
name: "core-tests",
defaults: ["libcore_java_defaults"],
hostdex: true,
+ no_framework_libs: true,
srcs: [
"dalvik/src/test/java/**/*.java",
"dalvik/test-rules/src/test/java/**/*.java",
@@ -370,6 +371,7 @@
name: "core-ojtests",
defaults: ["libcore_java_defaults"],
hostdex: true,
+ no_framework_libs: true,
srcs: [
"ojluni/src/test/java/**/*.java",
@@ -405,6 +407,7 @@
java_test {
name: "core-ojtests-public",
defaults: ["libcore_java_defaults"],
+ no_framework_libs: true,
srcs: [
"ojluni/src/test/java/**/*.java",
],