Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(816)

Unified Diff: chrome/chrome_common.gypi

Issue 23978005: Fix build breakage on chrome-for-tv (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolved Yuncheol's comment 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 | « no previous file | content/common/font_list_android.cc » ('j') | content/content_common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 7e4af84e8fae43113692a9f073f2682fcf84ebec..aa1da57bc22e7263ec3b01a7be9555482a9887a7 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -587,9 +587,15 @@
'common/importer/importer_data_types.cc',
'common/importer/importer_url_row.cc',
'common/net/url_util.cc',
- 'common/pepper_permission_util.cc',
'common/spellcheck_common.cc',
],
+ 'conditions': [
jam 2013/09/06 16:22:51 nit: no need to have a nested conditions section h
kjyoun 2013/09/09 00:13:45 chrome-for-tv is based on the Android (meaning tha
jam 2013/09/09 14:57:33 Yes I understand that part, but what you're fixing
kjyoun 2013/09/10 02:21:25 Got it and done! On 2013/09/09 14:57:33, jam wrote
+ ['enable_plugins!=1', {
+ 'source!' : [
+ 'common/pepper_permission_util.cc',
+ ],
+ }],
+ ],
'dependencies!': [
'<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',
],
« no previous file with comments | « no previous file | content/common/font_list_android.cc » ('j') | content/content_common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698