commit dc9f844cf91bc7dd3db8b67440bcf968e88e4c4d
author Hugo Drumond Jacob <hugojacob@google.com> Wed Jul 19 20:13:46 2023 +0200
committer Ray Chin <raychin@google.com> Mon Jul 24 08:12:51 2023 +0000
tree d9b26da97275cc8e547a6657f0c4ab95b8c3aa4b
parent be5a94b276884f9de846bab3e2430c24ba9be31a

Fix duplicated `data` field

While merging this from `android12L-test-dev` to `main`, the `data`
field got duplicated.

Merge the duplicated entries into a single one.

Change-Id: Ie97857cf1d4a41fd479e100616b533265c807de8
Merged-In: Ie97857cf1d4a41fd479e100616b533265c807de8
Bug: 285215697
(cherry picked from commit 19e99ad003838ace452fba806e60c818e67d3366)
(cherry picked from commit ee31a6e6c21bd44cc66a02a41116efc91341ad65)

test/cts/Android.bp

diff --git a/test/cts/Android.bp b/test/cts/Android.bp
index dda9bde..ff1d18f 100644
--- a/test/cts/Android.bp
+++ b/test/cts/Android.bp
@@ -59,6 +59,7 @@
         ":CtsPerfettoProducerApp",
         ":CtsPerfettoReleaseApp",
         ":CtsPerfettoDebuggableApp",
+        "perfetto_device_preparer.sh",
   ],
   stl: "libc++_static",
   // This test is also run via Mainline Testing against the ART Mainline
@@ -67,7 +68,4 @@
   defaults: [
     "perfetto_defaults",
   ],
-  data: [
-    "perfetto_device_preparer.sh",
-  ],
 }