diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-11 17:34:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 17:34:29 +0000 |
| commit | 3c9b470773d82d6b2ce8e83a63b341d210499327 (patch) | |
| tree | 3876337430a5624a2e43a6d2cc7a0a3e579b71ee | |
| parent | d9fcb584c9aa597b29d99628a49de53cee7e7668 (diff) | |
| parent | ecccf1cb0f3dccd5cf9955624fbc163912a579c2 (diff) | |
| download | trusty-android12-qpr3-s3-release.tar.gz | |
Merge "Add libtrusty_metrics_test to qemu_trusty_arm64" am: d54cb0d2ea am: 96b39d96ee am: ecccf1cb0fandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1697306
Change-Id: Iabfca065680ff18f1540415299a311576e478d6c
| -rw-r--r-- | qemu_trusty_base.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index 2fae0c4..e471d63 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -120,6 +120,7 @@ $(call inherit-product, system/core/trusty/trusty-test.mk) # Test Utilities PRODUCT_PACKAGES += \ tipc-test \ + libtrusty_metrics_test \ trusty-ut-ctrl \ VtsHalConfirmationUIV1_0TargetTest \ VtsHalGatekeeperV1_0TargetTest \ |