Rename some ART gtest related Soong modules.
ART gtests currently link with the debug ("d") versions of ART
libraries. The gtests themselves and their libraries are compiled as
debug artifacts. For the sake of consistency, perform the following
renaming of ART gtest related Soong modules:
* `libart-compiler-gtest` -> `libartd-compiler-gtest`
* `libart-dex2oat-gtest` -> `libartd-dex2oat-gtest`
* `libart-gtest-defaults` -> `libartd-gtest-defaults`
* `libart-gtest` -> `libartd-gtest`
* `libart-runtime-gtest` -> `libartd-runtime-gtest`
* `libartbase-art-gtest` -> `libartbased-art-gtest`
As we plan to introduce non-debug ("non-d"), standalone versions of
ART gtests in the context of uncoupling ART (target) gtests from the
ART APEX (b/162834439), this renaming will help us, as we'll be able
to use the old names of a "d" module for the corresponding "non-d"
version.
(cherry picked from commit 55ffe7fa9ead8b501a756bb53f2571e3e7602f5e)
Test: mmma art
Test: Run ART gtests on host and target
Test: env OVERRIDE_TARGET_FLATTEN_APEX=false art/build/apex/runtests.sh
Test: env OVERRIDE_TARGET_FLATTEN_APEX=true art/build/apex/runtests.sh
Bug: b/193218514
Bug: b/162834439
Change-Id: I4ca27a7f445a760398f41a9e60a7008d77294505
Merged-In: I4ca27a7f445a760398f41a9e60a7008d77294505
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index d3ccd8d..4c090a2 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -686,7 +686,7 @@
self._checker.check_art_test_executable('art_sigchain_tests')
# Check ART test (internal) libraries.
- self._checker.check_native_library('libart-gtest')
+ self._checker.check_native_library('libartd-gtest')
self._checker.check_native_library('libartd-simulator-container')
# Check ART test tools.
diff --git a/compiler/Android.bp b/compiler/Android.bp
index cb47d77..86f1712 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -327,16 +327,16 @@
}
art_cc_library {
- name: "libart-compiler-gtest",
- defaults: ["libart-gtest-defaults"],
+ name: "libartd-compiler-gtest",
+ defaults: ["libartd-gtest-defaults"],
srcs: [
"common_compiler_test.cc",
],
shared_libs: [
"libartd-compiler",
"libartd-disassembler",
- "libartbase-art-gtest",
- "libart-runtime-gtest",
+ "libartbased-art-gtest",
+ "libartd-runtime-gtest",
"libbase",
],
}
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 77eed44..a232b55 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -412,14 +412,14 @@
}
art_cc_library_static {
- name: "libart-dex2oat-gtest",
- defaults: ["libart-gtest-defaults"],
+ name: "libartd-dex2oat-gtest",
+ defaults: ["libartd-gtest-defaults"],
srcs: [
"common_compiler_driver_test.cc",
],
shared_libs: [
- "libart-compiler-gtest",
- "libart-runtime-gtest",
+ "libartd-compiler-gtest",
+ "libartd-runtime-gtest",
"libartd-compiler",
"libartd-disassembler",
"libbase",
@@ -519,7 +519,7 @@
"libziparchive",
],
static_libs: [
- "libart-dex2oat-gtest",
+ "libartd-dex2oat-gtest",
"libartd-dex2oat",
],
}
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 9dcba99..2b28397 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -222,8 +222,8 @@
}
art_cc_library {
- name: "libartbase-art-gtest",
- defaults: ["libart-gtest-defaults"],
+ name: "libartbased-art-gtest",
+ defaults: ["libartd-gtest-defaults"],
srcs: [
"base/common_art_test.cc",
],
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 6f94a2c..8ed2b61 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -427,7 +427,7 @@
],
// asm_support_gen.h (used by asm_support.h) is generated with cpp-define-generator
generated_headers: ["cpp-define-generator-asm-support"],
- // export our headers so the libart-gtest targets can use it as well.
+ // export our headers so the libart(d)-gtest targets can use it as well.
export_generated_headers: ["cpp-define-generator-asm-support"],
header_libs: [
@@ -630,15 +630,15 @@
}
art_cc_library {
- name: "libart-runtime-gtest",
- defaults: ["libart-gtest-defaults"],
+ name: "libartd-runtime-gtest",
+ defaults: ["libartd-gtest-defaults"],
srcs: [
"common_runtime_test.cc",
"dexopt_test.cc",
],
shared_libs: [
"libartd",
- "libartbase-art-gtest",
+ "libartbased-art-gtest",
"libbase",
"libbacktrace",
],
diff --git a/test/Android.bp b/test/Android.bp
index 1b890fe..fbef537 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -104,7 +104,7 @@
art_cc_defaults {
name: "art_gtest_defaults",
- // These really are gtests, but the gtest library comes from libart-gtest.so
+ // These really are gtests, but the gtest library comes from `libartd-gtest.so`.
gtest: false,
defaults: [
"art_test_defaults",
@@ -120,7 +120,7 @@
shared_libs: [
"libartd",
"libartd-disassembler",
- "libart-gtest",
+ "libartd-gtest",
"libdexfiled",
"libprofiled",
"libartbased",
@@ -161,7 +161,7 @@
}
art_cc_defaults {
- name: "libart-gtest-defaults",
+ name: "libartd-gtest-defaults",
host_supported: true,
defaults: [
"art_debug_defaults",
@@ -207,7 +207,7 @@
}
art_cc_library {
- name: "libart-gtest",
+ name: "libartd-gtest",
host_supported: true,
defaults: [
"art_debug_defaults",
@@ -217,9 +217,9 @@
"common/gtest_main.cc",
],
whole_static_libs: [
- "libart-compiler-gtest",
- "libart-runtime-gtest",
- "libartbase-art-gtest",
+ "libartd-compiler-gtest",
+ "libartd-runtime-gtest",
+ "libartbased-art-gtest",
"libgtest_isolated",
],
shared_libs: [