diff options
| author | 2024-03-13 18:31:28 +0000 | |
|---|---|---|
| committer | 2024-05-16 09:57:01 +0000 | |
| commit | 7e9fe3bb8f8ab7cf2ad06e1bd251886459300d49 (patch) | |
| tree | 7885c431342c0fad3cff76b0892f25f40571af1e | |
| parent | 467d3ccdd3ab293e2f48853578c9175422f9265c (diff) | |
Limit `test_for` to ART tests that explicitly link internal libraries.
`test_for` bypasses the stubs when tests are built against the shared
libs, so it should only be used for tests that intentionally link
dynamically to the ART implementation interfaces.
Test: mmm art/
Test: gtests in ART chroot
Test: art/libnativebridge/tests/runtests.sh
Bug: 247108425
Change-Id: I207000d5c9731209aa497e284bbc5106f8ab65d8
| -rw-r--r-- | libnativebridge/tests/Android.bp | 2 | ||||
| -rw-r--r-- | test/Android.bp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp index 85bdf9967c..3dbb79b730 100644 --- a/libnativebridge/tests/Android.bp +++ b/libnativebridge/tests/Android.bp @@ -102,7 +102,7 @@ cc_test { name: "libnativebridge-tests", defaults: [ "art_defaults", - "art_test_defaults", + "art_test_internal_library_defaults", ], target: { diff --git a/test/Android.bp b/test/Android.bp index cefdae887e..611f7ec9b0 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -110,6 +110,12 @@ art_cc_defaults { name: "art_test_internal_library_defaults", defaults: ["art_test_defaults"], target: { + android: { + test_for: [ + "com.android.art", + "com.android.art.debug", + ], + }, android_arm: { relative_install_path: "com.android.art/lib", }, @@ -375,10 +381,6 @@ art_cc_defaults { "libart-gtest", ], version_script: ":art-standalone-gtest-version", - test_for: [ - "com.android.art", - "com.android.art.debug", - ], } art_cc_defaults { |