From 2e75bd4ed8a6111f9bc5b71de23a1dee41137415 Mon Sep 17 00:00:00 2001
From: kjellander <kjellander@webrtc.org>
Date: Wed, 6 Sep 2017 03:14:20 -0700
Subject: [PATCH] Reland of Add //build/android/pylib/results/ to Android
 isolate packaging (patchset #1 id:1 of
 https://codereview.webrtc.org/3008083004/ )

Reason for revert:
Now making sure the data attribute contents is not wiped for non-Android targets,
which caused every test relying on resources to break.

Original issue's description:
> Revert of Add //build/android/pylib/results/ to Android isolate packaging (patchset #1 id:1 of https://codereview.webrtc.org/3006103002/ )
>
> Reason for revert:
> Breaks memcheck bot: https://build.chromium.org/p/client.webrtc/builders/Linux%20Memcheck/builds/11554
>
> Edward: do you understand why? I'll run a full CQ set before relanding for sure.
>
> Original issue's description:
> > Add //build/android/pylib/results/ to Android isolate packaging
> >
> > This is needed before relanding
> > https://chromium-review.googlesource.com/c/chromium/tools/build/+/619228
> >
> > TESTED=
> > I built tools_unittests and verified build/android/pylib/results/presentation/test_results_presentation.py
> > is listed in the .isolated file:
> > OUT=out/android-Release
> > TEST=tools_unittests
> > tools_webrtc/mb/mb.py isolate //$OUT $TEST
> > tools/swarming_client/isolate.py archive -I https://isolateserver.appspot.com -i $OUT/$TEST.isolate -s $OUT/$TEST.isolated
> >
> > BUG=chromium:717417
> > NOTRY=True
> >
> > Review-Url: https://codereview.webrtc.org/3006103002
> > Cr-Commit-Position: refs/heads/master@{#19695}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/f8ff0282c6b605f16fa5464b9496be1f6bac35ed
>
> TBR=ehmaldonado@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=chromium:717417
>
> Review-Url: https://codereview.webrtc.org/3008083004
> Cr-Commit-Position: refs/heads/master@{#19696}
> Committed: https://chromium.googlesource.com/external/webrtc/+/e5abac443a5cbaf5acdcdc7c0876f8ba2aa48ad1

BUG=chromium:717417

Review-Url: https://codereview.webrtc.org/3011023002
Cr-Commit-Position: refs/heads/master@{#19707}
---
 webrtc/webrtc.gni | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/webrtc/webrtc.gni b/webrtc/webrtc.gni
index af4d6f97db..7ff22466dc 100644
--- a/webrtc/webrtc.gni
+++ b/webrtc/webrtc.gni
@@ -265,6 +265,7 @@ template("rtc_test") {
                            "*",
                            [
                              "configs",
+                             "data",
                              "public_configs",
                              "suppressed_configs",
                            ])
@@ -275,9 +276,16 @@ template("rtc_test") {
     if (defined(invoker.public_configs)) {
       public_configs += invoker.public_configs
     }
+    data = []
+    if (defined(invoker.data)) {
+      data += invoker.data
+    }
     if (!build_with_chromium && is_android) {
       android_manifest = webrtc_root + "test/android/AndroidManifest.xml"
       deps += [ webrtc_root + "test:native_test_java" ]
+
+      # Needed for build/android/pylib/results/presentation/test_results_presentation.py
+      data += [ "//build/android/pylib/results/" ]
     }
   }
 }