build/common.gypi - Issue 692733003: Compile Android using GRIT's new --no-output-all-resource-defines flag.

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 692733003: Compile Android using GRIT's new --no-output-all-resource-defines flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merged two ifdefs Created 6 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

Index: build/common.gypi

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

index a0f114db1be59c7828aa43a04ab2e3e4fca56f7a..b8ed3b9ead616c151174399058ad25692fb9795c 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -2070,8 +2070,11 @@

}],

['OS=="android"', {

- 'grit_defines': ['-t', 'android',

- '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'],

+ 'grit_defines': [

+ '-t', 'android',

+ '-E', 'ANDROID_JAVA_TAGGED_ONLY=true',

+ '--no-output-all-resource-defines',

+ ],

}],

['OS=="mac" or OS=="ios"', {

'grit_defines': ['-D', 'scale_factors=2x'],

« no previous file with comments | « no previous file | chrome/browser/resources_util_unittest.cc » ('j') | no next file with comments »