Skip to content

Commit

Permalink
Fix duplicated data field
Browse files Browse the repository at this point in the history
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
Bug: 285215697
  • Loading branch information
hugojacob committed Jul 19, 2023
1 parent 6013ddc commit d4482a5
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions test/cts/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ cc_test {
":CtsPerfettoProducerApp",
":CtsPerfettoReleaseApp",
":CtsPerfettoDebuggableApp",
"perfetto_device_preparer.sh",
],
stl: "libc++_static",
// This test is also run via Mainline Testing against the ART Mainline
Expand All @@ -67,7 +68,4 @@ cc_test {
defaults: [
"perfetto_defaults",
],
data: [
"perfetto_device_preparer.sh",
],
}

0 comments on commit d4482a5

Please sign in to comment.