diff options
| author | Roland Levillain <rpl@google.com> | 2021-06-14 15:18:54 +0100 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2021-07-12 15:12:05 +0000 |
| commit | c28ac98c2fcba98c7248b46e32458be5105c85b2 (patch) | |
| tree | ea8478a3245ee5ea796527c385ccb70f1e0dcbc9 /compiler | |
| parent | 59072d14323e6750ab08fbd265ede0788b03d762 (diff) | |
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
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/Android.bp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp index cb47d7753e..86f1712cb7 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -327,16 +327,16 @@ cc_defaults { } 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", ], } |