build/common.gypi - Issue 1812383003: [Devil] Replace generated Devil config with jinja template.

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: build/common.gypi

Issue 1812383003: [Devil] Replace generated Devil config with jinja template. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed devil_chromium.json Created 4 years, 9 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

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index d4b1cc51ce313a73932a09a91994b807e9e9eaa6..6fd9341abcb1b0f8aca2b590e4b43a75e009e10e 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -1762,6 +1762,7 @@

'android_sdk%': '<(android_sdk_root)/platforms/android-<(android_sdk_version)',

# Android SDK build tools (e.g. dx, aidl)

+ 'android_sdk_build_tools_version%': '<(android_sdk_build_tools_version)',

'android_sdk_tools%': '<(android_sdk_root)/build-tools/<(android_sdk_build_tools_version)',

# Android API level 16 is JB (Android 4.1) which is the minimum

@@ -1829,6 +1830,7 @@

'android_ndk_include': '<(android_ndk_sysroot)/usr/include',

'android_ndk_lib': '<(android_ndk_sysroot)/<(android_ndk_lib_dir)',

+ 'android_sdk_build_tools_version%': '<(android_sdk_build_tools_version)',

jbudorick 2016/03/24 18:26:26 rebase, this exists now

mikecase (-- gone --) 2016/03/28 20:47:01 Woohoo! Rebased.

'android_sdk_tools%': '<(android_sdk_tools)',

'android_aapt_path%': '<(android_sdk_tools)/aapt',

'android_sdk%': '<(android_sdk)',

« build/android/devil_chromium.py ('K') | « build/android/setup.gyp ('k') | no next file » | no next file with comments »