build/common.gypi - Issue 657443002: Turn Chrome Shell's AndroidManifest into a jinja2 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 657443002: Turn Chrome Shell's AndroidManifest into a jinja2 template. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ignore import failure in pylint Created 6 years, 2 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 e9b1476c5899373fda5da635d0bcc5b73f9aa141..0ad62ee597ca1d822e84d13ac99d0e0b126abc16 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -147,6 +147,10 @@

'target_subarch%': '',

+ # The channel to build on Android: stable, beta, dev, canary, or

+ # default. "default" should be used on non-official builds.

+ 'android_channel%': 'default',

# This is set when building the Android WebView inside the Android

# build system, using the 'android' gyp backend. The WebView code is

# still built when this is unset, but builds using the normal chromium

@@ -285,6 +289,7 @@

'use_openssl_certs%': '<(use_openssl_certs)',

'enable_viewport%': '<(enable_viewport)',

'enable_hidpi%': '<(enable_hidpi)',

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

'android_webview_build%': '<(android_webview_build)',

'android_webview_telemetry_build%': '<(android_webview_telemetry_build)',

'use_goma%': '<(use_goma)',

@@ -1155,6 +1160,7 @@

'wix_path%': '<(wix_path)',

'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',

'use_system_libjpeg%': '<(use_system_libjpeg)',

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

'android_webview_build%': '<(android_webview_build)',

'android_webview_telemetry_build%': '<(android_webview_telemetry_build)',

'icu_use_data_file_flag%': '<(icu_use_data_file_flag)',

« no previous file with comments | « build/android/jinja_template.gypi ('k') | build/config/android/rules.gni » ('j') | no next file with comments »