Separate libart runtime/compiler static_defaults

This will help to extract libart targets and move them out of runtime/
dir, which is required to remove libart-runtime/libart-compiler static
libs.
Rename libart(d)_static_defaults to libart-runtime(d)_static_defaults and
remove libart-compiler dependencies.
Remove libartd-compiler-for-test_static_defaults since it's no longer
required.

Bug: 307933740
Test: m test-art-host-gtest
Change-Id: Idb3fd649aac70e0d53489904cb78cd708c02d7fd

2 files changed, 32 insertions, 33 deletions

diff --git a/compiler/Android.bp b/compiler/Android.bp
index 993b8970da..abfd234710 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -347,7 +347,6 @@ cc_defaults {
 }
 
 // libart-compiler_static_defaults for standalone gtests.
-// Uses libart-for-test_static_defaults instead of libart_static_defaults.
 // Uses libart-compiler-for-test instead of libart-compiler.
 cc_defaults {
     name: "libart-compiler-for-test_static_defaults",
@@ -389,22 +388,6 @@ cc_defaults {
     whole_static_libs: ["libartd-compiler"],
 }
 
-// libartd-compiler_static_defaults for gtests.
-// Uses libartd-for-test_static_defaults instead of libart_static_defaults.
-// Note that `libartd-compiler-for-test` is not required here, because `libartd-compiler`
-// doesn't use LTO.
-cc_defaults {
-    name: "libartd-compiler-for-test_static_defaults",
-    defaults: [
-        "libart-compiler_static_base_defaults",
-        "libartbased_static_defaults",
-        "libartd-disassembler_static_defaults",
-        "libdexfiled_static_defaults",
-        "libprofiled_static_defaults",
-    ],
-    whole_static_libs: ["libartd-compiler"],
-}
-
 // Export headers required by `libart-runtime` to use JIT from `libart-compiler`.
 cc_library_headers {
     name: "libart-compiler_jit_headers",
@@ -444,7 +427,9 @@ art_cc_library_static {
         "art_debug_defaults",
         "libart-gtest-defaults",
         "libart-compiler-gtest-common",
-        "libartd-compiler-for-test_static_defaults",
+        // Note that `libartd-compiler-for-test` is not required here, because
+        // `libartd-compiler` doesn't use LTO.
+        "libartd-compiler_static_defaults",
     ],
 }
 
diff --git a/runtime/Android.bp b/runtime/Android.bp
index a1d06c48d7..852b3d1b00 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -664,14 +664,13 @@ cc_defaults {
 }
 
 cc_defaults {
-    name: "libart_static_defaults",
+    name: "libart-runtime_static_defaults",
     defaults: [
         "libart_static_base_defaults",
         "libartbase_static_defaults",
         "libdexfile_static_defaults",
         "libdexfile_support_static_defaults",
         "libprofile_static_defaults",
-        "libart-compiler_static_defaults",
     ],
     whole_static_libs: [
         "libart-runtime",
@@ -682,14 +681,13 @@ cc_defaults {
 }
 
 cc_defaults {
-    name: "libartd_static_defaults",
+    name: "libartd-runtime_static_defaults",
     defaults: [
         "libart_static_base_defaults",
         "libartbased_static_defaults",
         "libdexfiled_static_defaults",
         "libdexfiled_support_static_defaults",
         "libprofiled_static_defaults",
-        "libartd-compiler_static_defaults",
     ],
     whole_static_libs: [
         "libartd-runtime",
@@ -699,18 +697,34 @@ cc_defaults {
     ],
 }
 
-// libart_static_defaults for standalone gtests.
-// Doesn't link libsigchain_fake.
-// Uses libart-(runtime/compiler)-for-test instead of libart-runtime/compiler.
 cc_defaults {
-    name: "libart-for-test_static_defaults",
+    name: "libart_static_defaults",
+    defaults: [
+        "libart-runtime_static_defaults",
+        "libart-compiler_static_defaults",
+    ],
+}
+
+cc_defaults {
+    name: "libartd_static_defaults",
+    defaults: [
+        "libartd-runtime_static_defaults",
+        "libartd-compiler_static_defaults",
+    ],
+}
+
+// libart-runtime_static_defaults for standalone gtests.
+// Doesn't link libsigchain_fake/libnativeloader (see art_gtest_common_defaults
+// in test/Android.bp for explanation).
+// Uses libart-runtime-for-test instead of libart-runtime.
+cc_defaults {
+    name: "libart-runtime-for-test_static_defaults",
     defaults: [
         "libart_static_base_defaults",
         "libartbase_static_defaults",
         "libdexfile_static_defaults",
         "libdexfile_support_static_defaults",
         "libprofile_static_defaults",
-        "libart-compiler-for-test_static_defaults",
     ],
     whole_static_libs: [
         "libart-runtime-for-test",
@@ -718,19 +732,19 @@ cc_defaults {
     ],
 }
 
-// libartd_static_defaults for gtests.
-// Doesn't link libsigchain_fake.
+// libartd-runtime_static_defaults for gtests.
+// Doesn't link libsigchain_fake/libnativeloader (see art_gtest_common_defaults
+// in test/Android.bp for explanation).
 // Note that `libartd-runtime-for-test` is not required here, because `libartd-runtime`
 // doesn't use LTO.
 cc_defaults {
-    name: "libartd-for-test_static_defaults",
+    name: "libartd-runtime-for-test_static_defaults",
     defaults: [
         "libart_static_base_defaults",
         "libartbased_static_defaults",
         "libdexfiled_static_defaults",
         "libdexfiled_support_static_defaults",
         "libprofiled_static_defaults",
-        "libartd-compiler-for-test_static_defaults",
     ],
     whole_static_libs: [
         "libartd-runtime",
@@ -945,7 +959,7 @@ art_cc_library_static {
     defaults: [
         "libart-runtime-gtest-defaults",
         "libart-gtest-defaults",
-        "libart-for-test_static_defaults",
+        "libart-runtime-for-test_static_defaults",
     ],
 }
 
@@ -955,7 +969,7 @@ art_cc_library_static {
         "art_debug_defaults",
         "libart-runtime-gtest-defaults",
         "libart-gtest-defaults",
-        "libartd-for-test_static_defaults",
+        "libartd-runtime-for-test_static_defaults",
     ],
 }