diff options
author | Roland Levillain <rpl@google.com> | 2022-04-06 11:41:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-06 11:41:37 +0000 |
commit | 49ecc5f1e97e810d27e2c6558abdde49e875349b (patch) | |
tree | 29b826ccd84c9eca867f4c759b61e13c8af303af | |
parent | e77bd4a3612aa412737242c4f7a50e9ef59d46a0 (diff) | |
parent | f25c36deb6e1955c507677702733109818d411ff (diff) | |
download | libnativehelper-android13-qpr2-s11-release.tar.gz |
Merge "Move `libnativehelper` tests from `device-tests` to `general-tests`." am: 08074ea6e9 am: dc8b296e2a am: 7d8e2a6503 am: 9b00bc0e9c am: f25c36deb6android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Original change: https://android-review.googlesource.com/c/platform/libnativehelper/+/2051244
Change-Id: I2c9b26668f319dd2e2bfd9978cb6f6d2dbaef4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/Android.bp | 4 | ||||
-rw-r--r-- | tests_mts/Android.bp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index caf8131..99ec108 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -61,7 +61,7 @@ cc_defaults { cc_test { name: "libnativehelper_tests", defaults: ["libnativehelper_test_defaults"], - test_suites: ["device-tests"], + test_suites: ["general-tests"], srcs: [ "scoped_local_frame_test.cpp", "scoped_local_ref_test.cpp", @@ -75,7 +75,7 @@ cc_test { cc_test { name: "libnativehelper_lazy_tests", defaults: ["libnativehelper_test_defaults"], - test_suites: ["device-tests"], + test_suites: ["general-tests"], srcs: ["libnativehelper_lazy_test.cpp"], shared_libs: ["liblog"], static_libs: ["libnativehelper_lazy"], diff --git a/tests_mts/Android.bp b/tests_mts/Android.bp index 6496983..9483a62 100644 --- a/tests_mts/Android.bp +++ b/tests_mts/Android.bp @@ -34,7 +34,7 @@ java_defaults { sdk_version: "test_current", srcs: ["src/com/android/art/libnativehelper/JniHelpTest.java"], test_suites: [ - "device-tests", + "general-tests", "mts", ], } |