| Index: remoting/remoting.gyp
|
| diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
|
| index 2369896d2ff59ec6c9f793e71836d62bba8f7a5c..b65796b4c9fe1adddb3201c601f022fe5433cee2 100644
|
| --- a/remoting/remoting.gyp
|
| +++ b/remoting/remoting.gyp
|
| @@ -167,6 +167,9 @@
|
| 'remoting_jingle_glue',
|
| '../third_party/npapi/npapi.gyp:npapi',
|
| ],
|
| + 'include_dirs': [
|
| + '../skia/config',
|
| + ],
|
| 'sources': [
|
| 'host/plugin/host_plugin.cc',
|
| 'host/plugin/host_plugin.def',
|
| @@ -284,6 +287,9 @@
|
| # TODO(hclam): Enable VP8 in the build.
|
| #'third_party/on2/on2.gyp:vp8',
|
| ],
|
| + 'include_dirs': [
|
| + '../skia/config',
|
| + ],
|
| 'export_dependent_settings': [
|
| '../base/base.gyp:base',
|
| '../net/net.gyp:net',
|
| @@ -330,7 +336,6 @@
|
| 'base/task_thread_proxy.h',
|
| 'base/tracer.cc',
|
| 'base/tracer.h',
|
| - 'base/types.h',
|
| 'base/util.cc',
|
| 'base/util.h',
|
| ],
|
| @@ -356,6 +361,9 @@
|
| 'differ_block',
|
| '../crypto/crypto.gyp:crypto',
|
| ],
|
| + 'include_dirs': [
|
| + '../skia/config',
|
| + ],
|
| 'sources': [
|
| 'host/access_verifier.h',
|
| 'host/capturer.h',
|
| @@ -474,6 +482,9 @@
|
| 'remoting_jingle_glue',
|
| 'remoting_protocol',
|
| ],
|
| + 'include_dirs': [
|
| + '../skia/config',
|
| + ],
|
| 'sources': [
|
| 'client/chromoting_client.cc',
|
| 'client/chromoting_client.h',
|
| @@ -504,6 +515,9 @@
|
| '../base/base.gyp:base_i18n',
|
| '../media/media.gyp:media',
|
| ],
|
| + 'include_dirs': [
|
| + '../skia/config',
|
| + ],
|
| 'sources': [
|
| 'host/capturer_fake_ascii.cc',
|
| 'host/capturer_fake_ascii.h',
|
| @@ -671,9 +685,6 @@
|
| {
|
| 'target_name': 'differ_block',
|
| 'type': 'static_library',
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| 'dependencies': [
|
| '../media/media.gyp:cpu_features',
|
| ],
|
| @@ -693,9 +704,6 @@
|
| {
|
| 'target_name': 'differ_block_sse2',
|
| 'type': 'static_library',
|
| - 'include_dirs': [
|
| - '..',
|
| - ],
|
| 'conditions': [
|
| [ 'os_posix == 1 and OS != "mac"', {
|
| 'cflags': [
|
| @@ -742,6 +750,7 @@
|
| ],
|
| 'include_dirs': [
|
| '../testing/gmock/include',
|
| + '../skia/config',
|
| ],
|
| 'sources': [
|
| 'base/auth_token_util_unittest.cc',
|
|
|