| commit | 304df4037b9278fa28c43d0e3430ddb4ab82be4f | [log] [tgz] |
|---|---|---|
| author | Armelle Laine <armellel@google.com> | Thu Mar 06 13:28:07 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 06 13:28:07 2025 -0800 |
| tree | 86e90d92784120ea6f065f8934c6cc1f34028cd6 | |
| parent | 8121fc9023748b14b968e374c218b1d1ef86f93c [diff] | |
| parent | a7c1bde79235c21782f5ce8afd076d2dd3b6ede1 [diff] |
Merge "trusty: utils: trusty-ut-ctrl: declare trusty-ut-ctrl.system as cc_test" into main am: c3783d7196 am: a7c1bde792 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3518557 Change-Id: I44794f7be3e0d2ef3b491a2ad0307df9973bd3bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/trusty/utils/trusty-ut-ctrl/Android.bp b/trusty/utils/trusty-ut-ctrl/Android.bp index c255614..dbd8016 100644 --- a/trusty/utils/trusty-ut-ctrl/Android.bp +++ b/trusty/utils/trusty-ut-ctrl/Android.bp
@@ -39,8 +39,8 @@ vendor: true, } -cc_binary { +cc_test { name: "trusty-ut-ctrl.system", defaults: ["trusty-ut-ctrl.defaults"], - system_ext_specific: true, + gtest: false, }