scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.intel.32.json - Issue 23532085: [chormium_android api] Set KLP and x86 GYP_DEFINES.

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/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.intel.32.json

Issue 23532085: [chormium_android api] Set KLP and x86 GYP_DEFINES. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Remove a spurious pass Created 7 years, 3 months 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

« no previous file with comments | « scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.arm.64.json ('k') | scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.intel.64.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.intel.32.json

diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.intel.32.json b/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.intel.32.json

index 2eeea1747625f2f7a7e15adba4f419dd89e9ea7b..acdc7b2481920279a9cf66f5652e25631e29e4cc 100644

--- a/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.intel.32.json

+++ b/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.64-to-chromeos.intel.32.json

@@ -92,7 +92,7 @@

"gyp_env": {

"GYP_CROSSCOMPILE": "1",

- "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",

+ "GYP_DEFINES": "OS=android android_sdk_root=['third_party', 'android_tools_internal', 'sdk'] android_sdk_version=KeyLimePie component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",

"GYP_GENERATORS": "ninja",

"GYP_GENERATOR_FLAGS": "default_target=All"

}

@@ -168,7 +168,7 @@

"gyp_env": {

"GYP_CROSSCOMPILE": "1",

- "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=arm",

+ "GYP_DEFINES": "OS=android component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=['orderfiles', 'orderfile.out'] target_arch=x86",

"GYP_GENERATORS": "ninja",

"GYP_GENERATOR_FLAGS": "default_target=All"

}