scripts/slave/recipes/android/instrumentation_tests.expected/main_tests.json - Issue 59233015: Make gyp target_arch setting native to chromium/config.py

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipes/android/instrumentation_tests.expected/main_tests.json

Issue 59233015: Make gyp target_arch setting native to chromium/config.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: rebase again Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« scripts/slave/recipe_modules/chromium/config.py ('K') | « scripts/slave/recipes/android/instrumentation_tests.expected/enormous_tests.json ('k') | scripts/slave/recipes/android/instrumentation_tests.expected/main_tests_deploy_fail.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/instrumentation_tests.expected/main_tests.json

diff --git a/scripts/slave/recipes/android/instrumentation_tests.expected/main_tests.json b/scripts/slave/recipes/android/instrumentation_tests.expected/main_tests.json

index b60a4745b802484366af3acd4c6309903b77eef2..271e3974b811a6589cbbae73f5acf285a1b5fef9 100644

--- a/scripts/slave/recipes/android/instrumentation_tests.expected/main_tests.json

+++ b/scripts/slave/recipes/android/instrumentation_tests.expected/main_tests.json

@@ -88,7 +88,8 @@

"[BUILD]/scripts/slave/env_dump.py",

"--output-json",

"/path/to/tmp/json",

- "[SLAVE_BUILD]/src/build/android/envsetup.sh"

+ "[SLAVE_BUILD]/src/build/android/envsetup.sh",

+ "--target-arch=arm"

"env": {

"PATH": "[BUILD_INTERNAL]/scripts/slave/android:%(PATH)s"