Add core-libart-for-host and okhttp-for-host to sdk
Moves core-libart and okhttp to the art-module-sdk's java_boot_libs
property and adds core-libart-for-host and okhttp-for-host to the
art-module-test-exports.
Bug: 185789034
Test: m robolectric_android-all-device-deps layoutlib
Change-Id: I8bd25a87bdad89014a57390f058f55af3e125a0a
diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index 2dadee0..1e3e15e 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -103,11 +103,9 @@
java_boot_libs: [
"apache-xml",
"bouncycastle",
+ "core-libart",
"core-oj",
- // The following are boot libs that are provided as java_libs in
- // art-module-test-exports.
- // "core-libart",
- // "okhttp",
+ "okhttp",
],
java_header_libs: [
@@ -260,8 +258,8 @@
"expected_cts_outputs",
// Needed for robolectric.
- "core-libart",
- "okhttp",
+ "core-libart-for-host",
+ "okhttp-for-host",
// Needed for CtsLibcore...TestCases
"libcore-expectations-knownfailures-jar",