Restructure the contents of art/test/Android.bp.
Highlight what pertains to ART gtests vs ART run-tests.
Test: m
Change-Id: Ie241dda8a2de567378a4dfd60deeee4cc67832df
diff --git a/test/Android.bp b/test/Android.bp
index ac83a5d..f10d378 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -14,6 +14,8 @@
// limitations under the License.
//
+// ART gtests.
+
art_cc_defaults {
name: "art_test_defaults",
host_supported: true,
@@ -168,6 +170,62 @@
},
}
+// ART run-tests.
+
+art_cc_test_library {
+ name: "libarttest",
+ defaults: ["libarttest-defaults"],
+ shared_libs: [
+ "libart",
+ "libdexfile",
+ "libprofile",
+ "libartbase",
+ ],
+}
+
+art_cc_test_library {
+ name: "libarttestd",
+ defaults: [
+ "art_debug_defaults",
+ "libarttest-defaults",
+ ],
+ shared_libs: [
+ "libartd",
+ "libdexfiled",
+ "libprofiled",
+ "libartbased",
+ ],
+}
+
+art_cc_defaults {
+ name: "libnativebridgetest-defaults",
+ defaults: [
+ "art_test_defaults",
+ "art_defaults",
+ ],
+ header_libs: ["libnativebridge-headers"],
+ srcs: ["115-native-bridge/nativebridge.cc"],
+}
+
+art_cc_test_library {
+ name: "libnativebridgetest",
+ shared_libs: ["libart"],
+ defaults: [
+ "libnativebridgetest-defaults",
+ ],
+}
+
+art_cc_test_library {
+ name: "libnativebridgetestd",
+ shared_libs: ["libartd"],
+ defaults: [
+ "libnativebridgetest-defaults",
+ "art_debug_defaults",
+ ],
+}
+
+// ART JVMTI run-tests.
+
cc_defaults {
name: "libartagent-defaults",
defaults: [
@@ -529,58 +587,6 @@
],
}
-art_cc_test_library {
- name: "libarttest",
- defaults: ["libarttest-defaults"],
- shared_libs: [
- "libart",
- "libdexfile",
- "libprofile",
- "libartbase",
- ],
-}
-
-art_cc_test_library {
- name: "libarttestd",
- defaults: [
- "art_debug_defaults",
- "libarttest-defaults",
- ],
- shared_libs: [
- "libartd",
- "libdexfiled",
- "libprofiled",
- "libartbased",
- ],
-}
-
-art_cc_defaults {
- name: "libnativebridgetest-defaults",
- defaults: [
- "art_test_defaults",
- "art_defaults",
- ],
- header_libs: ["libnativebridge-headers"],
- srcs: ["115-native-bridge/nativebridge.cc"],
-}
-
-art_cc_test_library {
- name: "libnativebridgetest",
- shared_libs: ["libart"],
- defaults: [
- "libnativebridgetest-defaults",
- ],
-}
-
-art_cc_test_library {
- name: "libnativebridgetestd",
- shared_libs: ["libartd"],
- defaults: [
- "libnativebridgetest-defaults",
- "art_debug_defaults",
- ],
-}
-
filegroup {
name: "art_cts_jvmti_test_library",
visibility: [