Revert "art: Remove dependencies on platform unavailable modules"
Revert "releasetools: Disable host module on darwin"
Revert "conscrypt: Disable host module on darwin"
Revert submission 1385032-mac-required-fix
Reason for revert: breaks the build on aosp-master
Reverted Changes:
I13335299c:releasetools: Disable host module on darwin
I728a4677a:conscrypt: Disable host module on darwin
I8f3435ff1:art: Remove dependencies on platform unavailable m...
Ibb9248ef4:art: Disable host module on darwin
I7db68a629:libcore: Disable host module on darwin
Bug: 163030797
Change-Id: Ibe83fc65bca64602e8b37b58b2ad6e20476efa63
diff --git a/runtime/Android.bp b/runtime/Android.bp
index e8d95bd..2ffd404 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -745,11 +745,7 @@
"verifier/method_verifier_test.cc",
"verifier/reg_type_test.cc",
],
- target: {
- host: {
- required: ["dex2oatd"],
- },
- },
+ required: ["dex2oatd"],
shared_libs: [
"libbacktrace",
],
@@ -767,11 +763,7 @@
"reflection_test.cc",
"module_exclusion_test.cc",
],
- target: {
- host: {
- required: ["dex2oatd"],
- },
- },
+ required: ["dex2oatd"],
data: [
":art-gtest-jars-Main",
":art-gtest-jars-NonStaticLeafMethods",