Chromium Code Reviews| Index: content/content_common.gypi |
| diff --git a/content/content_common.gypi b/content/content_common.gypi |
| index 631bd74e7958b7a8392fa1c00e46310e1e68d1bf..883486b38ae7fa4de1176ebe8a09f254b3cc30ad 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', { |
|
jam
2013/09/06 16:22:51
ditto
kjyoun
2013/09/10 02:21:25
Done.
|
| + 'sources!' : [ |
| + 'common/font_list.cc', |
| + 'common/font_list_android.cc', |
| + 'common/sandbox_util.cc', |
| + ], |
| + }], |
| + ], |
| 'link_settings': { |
| 'libraries': [ |
| '-landroid', # ANativeWindow |