chrome/chrome_common.gypi - Issue 831813004: Get nacl building again for android

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: chrome/chrome_common.gypi

Issue 831813004: Get nacl building again for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Code review comments addressed Created 5 years, 11 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:

Index: chrome/chrome_common.gypi

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi

index 83a320d3bc198b853e07144bef771b8765ad0c2c..50ba498366a78c86c63a6da528a41fd24e8a7647 100644

--- a/chrome/chrome_common.gypi

+++ b/chrome/chrome_common.gypi

@@ -409,6 +409,10 @@

'sources': [

'common/pepper_flash.cc',

'common/pepper_flash.h',

+ ],

+ }],

+ ['enable_plugins==1 and enable_extensions==1', {

Lei Zhang 2015/01/22 22:00:47 You probably need to make this change in chrome/co

sehr 2015/01/23 00:05:03 Done.

+ 'sources': [

'common/pepper_permission_util.cc',

'common/pepper_permission_util.h',