commit 265b84dda9b01acd891dd9ae039feeb01e1281f1
author Yihan Dong <slotus@google.com> Wed Feb 21 11:05:23 2024 +0800
committer Yihan Dong <slotus@google.com> Wed Feb 21 03:48:49 2024 +0000
tree 9f2bda01248926df96806bf45293cb34e18c071e
parent 44db658f1babc9c734a35a912bd31bd86d5f3e75

Change the shared libs order

Make vts-tradefed-harness before cts-tradefed-harness so that when they
contian res files with a same name, vts version will always be included.

Test: make vts; vts-tradefed; run vts-collect-tests-only
Bug: 325991731
Change-Id: Ie503a227c485af63b4b4d51d1f16b757290ab800

tools/vts-core-tradefed/Android.bp

diff --git a/tools/vts-core-tradefed/Android.bp b/tools/vts-core-tradefed/Android.bp
index 99af4e2..b8595db 100644
--- a/tools/vts-core-tradefed/Android.bp
+++ b/tools/vts-core-tradefed/Android.bp
@@ -37,8 +37,8 @@
     full_name: "Vendor Test Suite",
     version: "14_r4",
     static_libs: [
-        "cts-tradefed-harness",
         "vts-core-tradefed-harness",
+        "cts-tradefed-harness",
     ],
     required: ["compatibility-host-util"],
 }