Index: content/content_common.gypi |
diff --git a/content/content_common.gypi b/content/content_common.gypi |
index 631bd74e7958b7a8392fa1c00e46310e1e68d1bf..2703c6627d443c696f6f6c64837c62ba8c2f57e9 100644 |
--- a/content/content_common.gypi |
+++ b/content/content_common.gypi |
@@ -173,6 +173,7 @@ |
'common/font_config_ipc_linux.h', |
'common/font_list.cc', |
'common/font_list.h', |
+ 'common/font_list_android.cc', |
'common/font_list_mac.mm', |
'common/font_list_pango.cc', |
'common/font_list_win.cc', |
@@ -424,10 +425,17 @@ |
}], |
['OS=="android"',{ |
'sources!': [ |
- 'common/font_list.cc', |
- 'common/sandbox_util.cc', |
'public/common/child_process_host_delegate.cc', |
], |
+ 'conditions': [ |
+ ['enable_plugins!=1', { |
ycheo (away)
2013/09/05 05:26:02
2 spaces for the indentation.
kjyoun
2013/09/05 06:26:51
Done.
|
+ 'sources!' : [ |
+ 'common/font_list.cc', |
+ 'common/font_list_android.cc', |
+ 'common/sandbox_util.cc', |
+ ], |
+ }], |
+ ], |
'link_settings': { |
'libraries': [ |
'-landroid', # ANativeWindow |