admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reland of Add //build/android/pylib/results/ to Android isolate packaging (patchset #1 id:1 of https://codereview.webrtc.org/3008083004/ )

Browse Source 
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: f8ff0282c6
>
> 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: e5abac443a

BUG=chromium:717417

Review-Url: https://codereview.webrtc.org/3011023002
Cr-Commit-Position: refs/heads/master@{#19707}
This commit is contained in:
kjellander 2017-09-06 03:14:20 -07:00 committed by Commit Bot
parent 789825c42d
commit 2e75bd4ed8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/webrtc.gni
View File

@ -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/" ]
}
}
}