Revert^2 "art: Remove dependencies on platform unavailable modules"
Revert^2 "releasetools: Disable host module on darwin"
0ac3666667de42bd681586d642b52fc9e62e488f
Change-Id: I0c2edeea8a10acc4a6e74a0660ebf7aa5dd67d1b
diff --git a/Android.mk b/Android.mk
index 5a236ce..e445a14 100644
--- a/Android.mk
+++ b/Android.mk
@@ -458,15 +458,6 @@
endif
endif # HOST_OS != darwin
-# ART on the target.
-ifeq ($(ART_BUILD_TARGET_DEBUG),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := art-libartd-libopenjdkd-target-dependency
-LOCAL_MULTILIB := both
-LOCAL_REQUIRED_MODULES := libopenjdkd
-include $(BUILD_PHONY_PACKAGE)
-endif
-
########################################################################
# "m build-art" for quick minimal build
.PHONY: build-art
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index b6c942d..474dac1 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -460,7 +460,11 @@
"linker/oat_writer_test.cc",
"verifier_deps_test.cc",
],
- required: ["dex2oatd"],
+ target: {
+ host: {
+ required: ["dex2oatd"],
+ },
+ },
codegen: {
arm: {
diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index c51d709..c21fb59 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -65,5 +65,9 @@
"art_gtest_defaults",
],
srcs: ["dexdump_test.cc"],
- required: ["dexdump"],
+ target: {
+ host: {
+ required: ["dexdump"],
+ },
+ },
}
diff --git a/dexlayout/Android.bp b/dexlayout/Android.bp
index 31bee03..c21ea35 100644
--- a/dexlayout/Android.bp
+++ b/dexlayout/Android.bp
@@ -239,10 +239,14 @@
":art-gtest-jars-ManyMethods",
],
srcs: ["dexlayout_test.cc"],
- required: [
- "dexlayoutd",
- "dexdump",
- ],
+ target: {
+ host: {
+ required: [
+ "dexdump",
+ "dexlayoutd",
+ ],
+ },
+ },
}
art_cc_binary {
@@ -278,5 +282,9 @@
"art_gtest_defaults",
],
srcs: ["dexdiag_test.cc"],
- required: ["dexdiag"],
+ target: {
+ host: {
+ required: ["dexdiag"],
+ },
+ },
}
diff --git a/dexlist/Android.bp b/dexlist/Android.bp
index 136426b..4cb4ad2 100644
--- a/dexlist/Android.bp
+++ b/dexlist/Android.bp
@@ -54,5 +54,9 @@
"art_gtest_defaults",
],
srcs: ["dexlist_test.cc"],
- required: ["dexlist"],
+ target: {
+ host: {
+ required: ["dexlist"],
+ },
+ },
}
diff --git a/dexoptanalyzer/Android.bp b/dexoptanalyzer/Android.bp
index f1bb456..4207e65 100644
--- a/dexoptanalyzer/Android.bp
+++ b/dexoptanalyzer/Android.bp
@@ -82,8 +82,12 @@
":art-gtest-jars-VerifierDepsMulti",
],
srcs: ["dexoptanalyzer_test.cc"],
- required: [
- "dex2oatd",
- "dexoptanalyzerd",
- ],
+ target: {
+ host: {
+ required: [
+ "dex2oatd",
+ "dexoptanalyzerd",
+ ],
+ },
+ },
}
diff --git a/imgdiag/Android.bp b/imgdiag/Android.bp
index 185e03e..db9435b 100644
--- a/imgdiag/Android.bp
+++ b/imgdiag/Android.bp
@@ -85,5 +85,9 @@
"art_gtest_defaults",
],
srcs: ["imgdiag_test.cc"],
- required: ["imgdiagd"],
+ target: {
+ host: {
+ required: ["imgdiagd"],
+ },
+ },
}
diff --git a/oatdump/Android.bp b/oatdump/Android.bp
index 5d53d45..545d676 100644
--- a/oatdump/Android.bp
+++ b/oatdump/Android.bp
@@ -146,11 +146,15 @@
"oatdump_test.cc",
"oatdump_image_test.cc",
],
- required: [
- "oatdumpd",
- "oatdumpds",
- "dexdump",
- "dex2oatd",
- "dex2oatds",
- ],
+ target: {
+ host: {
+ required: [
+ "dex2oatd",
+ "dex2oatds",
+ "dexdump",
+ "oatdumpd",
+ "oatdumpds",
+ ],
+ },
+ },
}
diff --git a/profman/Android.bp b/profman/Android.bp
index 806170a..25f7ae3 100644
--- a/profman/Android.bp
+++ b/profman/Android.bp
@@ -102,5 +102,9 @@
":art-gtest-jars-ProfileTestMultiDex",
],
srcs: ["profile_assistant_test.cc"],
- required: ["profmand"],
+ target: {
+ host: {
+ required: ["profmand"],
+ },
+ },
}
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 2ffd404..e8d95bd 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -745,7 +745,11 @@
"verifier/method_verifier_test.cc",
"verifier/reg_type_test.cc",
],
- required: ["dex2oatd"],
+ target: {
+ host: {
+ required: ["dex2oatd"],
+ },
+ },
shared_libs: [
"libbacktrace",
],
@@ -763,7 +767,11 @@
"reflection_test.cc",
"module_exclusion_test.cc",
],
- required: ["dex2oatd"],
+ target: {
+ host: {
+ required: ["dex2oatd"],
+ },
+ },
data: [
":art-gtest-jars-Main",
":art-gtest-jars-NonStaticLeafMethods",
diff --git a/tools/dexanalyze/Android.bp b/tools/dexanalyze/Android.bp
index 909d9b8..8f76cae 100644
--- a/tools/dexanalyze/Android.bp
+++ b/tools/dexanalyze/Android.bp
@@ -45,7 +45,6 @@
art_cc_test {
name: "art_dexanalyze_tests",
- required: ["dexanalyze"],
defaults: [
"art_gtest_defaults",
],
@@ -55,4 +54,9 @@
srcs: [
"dexanalyze_test.cc",
],
+ target: {
+ host: {
+ required: ["dexanalyze"],
+ },
+ },
}