diff options
| author | kjyoun@google.com <kjyoun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 15:18:26 +0000 |
|---|---|---|
| committer | kjyoun@google.com <kjyoun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 15:18:26 +0000 |
| commit | e3d1937729d9898dff210182e5f326d62ec0eb5d (patch) | |
| tree | 8eb07966f980e777a840547a01fd3857374e71ca /content | |
| parent | 992220e58a7d9d74f1034565438922338ca53402 (diff) | |
| download | chromium_src-e3d1937729d9898dff210182e5f326d62ec0eb5d.zip chromium_src-e3d1937729d9898dff210182e5f326d62ec0eb5d.tar.gz chromium_src-e3d1937729d9898dff210182e5f326d62ec0eb5d.tar.bz2 | |
Fix build breakage on chrome-for-tv
Since chrome-for-tv is using pepper plugins while based on Android.
we should add some files necessary for pepper plugins to |sources|,
when pepper plugin is enabled on android.
BUG=
Review URL: https://chromiumcodereview.appspot.com/23978005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/font_list_android.cc | 15 | ||||
| -rw-r--r-- | content/content_common.gypi | 7 | ||||
| -rw-r--r-- | content/content_renderer.gypi | 2 |
3 files changed, 19 insertions, 5 deletions
diff --git a/content/common/font_list_android.cc b/content/common/font_list_android.cc new file mode 100644 index 0000000..b0a542d --- /dev/null +++ b/content/common/font_list_android.cc @@ -0,0 +1,15 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "content/common/font_list.h" + +#include "base/values.h" + +namespace content { + +scoped_ptr<ListValue> GetFontList_SlowBlocking() { + return scoped_ptr<ListValue>(new ListValue); +} + +} // namespace content diff --git a/content/content_common.gypi b/content/content_common.gypi index 5594870..e8d137e 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -170,6 +170,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', @@ -433,10 +434,6 @@ }, }], ['OS=="android"',{ - 'sources!': [ - 'common/font_list.cc', - 'common/sandbox_util.cc', - ], 'link_settings': { 'libraries': [ '-landroid', # ANativeWindow @@ -483,8 +480,10 @@ ], }, { # enable_plugins == 0 'sources!': [ + 'common/font_list.cc', 'common/pepper_plugin_list.cc', 'common/pepper_plugin_list.h', + 'common/sandbox_util.cc', ], }], ['enable_gpu==1', { diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 3e06bf2..631970f 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -534,7 +534,6 @@ 'renderer/accessibility/renderer_accessibility_focus_only.cc' 'renderer/media/audio_decoder.cc', 'renderer/media/filter_helpers.cc', - 'renderer/media/pepper_platform_video_decoder.cc', 'renderer/media/webmediaplayer_impl.cc', ], 'dependencies': [ @@ -675,6 +674,7 @@ ['exclude', '^renderer/pepper/'], ], 'sources!': [ + 'renderer/media/pepper_platform_video_decoder.cc', 'renderer/media/video_destination_handler.cc', 'renderer/media/video_destination_handler.h', 'renderer/render_widget_fullscreen_pepper.cc', |