scripts/slave/recipes/android/android_builder.expected/klp_builder.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/recipes/android/android_builder.expected/klp_builder.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_android/chromium_config.py ('k') | scripts/slave/recipes/android/android_builder.expected/x86_builder.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/android_builder.expected/klp_builder.json

diff --git a/scripts/slave/recipes/android/android_builder.expected/klp_builder.json b/scripts/slave/recipes/android/android_builder.expected/klp_builder.json

index f478ff117286f668e96ae16846f1659e447eb1b0..bae6c3c3eb7b4b7e2f3c9ecf4236636d4f559c18 100644

--- a/scripts/slave/recipes/android/android_builder.expected/klp_builder.json

+++ b/scripts/slave/recipes/android/android_builder.expected/klp_builder.json

@@ -127,7 +127,7 @@

"ANDROID_SDK_VERSION": "KeyLimePie",

"EXTRA_LANDMINES_SCRIPT": "[SLAVE_BUILD_ROOT]/src/repo/build/get_internal_landmines.py",

"GYP_CROSSCOMPILE": "1",

- "GYP_DEFINES": "OS=android app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=[SLAVE_BUILD_ROOT]/src/orderfiles/orderfile.out target_arch=arm",

+ "GYP_DEFINES": "OS=android android_sdk_root=[SLAVE_BUILD_ROOT]/src/third_party/android_tools_internal/sdk android_sdk_version=KeyLimePie app_manifest_version_code=10 app_manifest_version_name=some_builder_1234 chrome_build_id=3333 component=shared_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=[SLAVE_BUILD_ROOT]/src/orderfiles/orderfile.out target_arch=arm",

"GYP_GENERATORS": "ninja",

"GYP_GENERATOR_FLAGS": "default_target=All",

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