diff options
| author | Hugo Drumond Jacob <hugojacob@google.com> | 2023-07-19 20:23:19 +0200 |
|---|---|---|
| committer | Hugo Drumond Jacob <hugojacob@google.com> | 2023-07-19 18:52:22 +0000 |
| commit | 5c8d324994b31c83133b2cc463e80a138934abe4 (patch) | |
| tree | 0a5fec02ac4e2be359120e6f14db60664ac25f6a | |
| parent | d410418f04fe2386de22f73e96fc7cddd8cba33b (diff) | |
| download | perfetto-5c8d324994b31c83133b2cc463e80a138934abe4.tar.gz | |
[DO NOT MERGE] 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 d4482a5a8d4b70722f8c573290661bfa6e85d368)
| -rw-r--r-- | test/cts/Android.bp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/cts/Android.bp b/test/cts/Android.bp index b1925f131..856b4d24a 100644 --- a/test/cts/Android.bp +++ b/test/cts/Android.bp @@ -56,13 +56,11 @@ cc_test { ":CtsPerfettoProducerApp", ":CtsPerfettoReleaseApp", ":CtsPerfettoDebuggableApp", - ":CtsPerfettoReporterApp" + ":CtsPerfettoReporterApp", + "perfetto_device_preparer.sh", ], stl: "libc++_static", defaults: [ "perfetto_defaults", ], - data: [ - "perfetto_device_preparer.sh", - ], } |