| Index: content/content_shell.gypi
|
| diff --git a/content/content_shell.gypi b/content/content_shell.gypi
|
| index 9923bf9bdc6c924ff60a6b024c10e3ee8e066379..4f908bd1dd0f0d162c15238c84058ad392d7f5af 100644
|
| --- a/content/content_shell.gypi
|
| +++ b/content/content_shell.gypi
|
| @@ -75,6 +75,7 @@
|
| 'shell/shell_content_renderer_client.cc',
|
| 'shell/shell_content_renderer_client.h',
|
| 'shell/shell_devtools_delegate.cc',
|
| + 'shell/shell_devtools_delegate_android.cc',
|
| 'shell/shell_devtools_delegate.h',
|
| 'shell/shell_download_manager_delegate.cc',
|
| 'shell/shell_download_manager_delegate.h',
|
| @@ -134,19 +135,22 @@
|
| },
|
| },
|
| }], # OS=="win"
|
| - ['OS!="android"', {
|
| - 'dependencies': [
|
| - # This dependency is for running DRT against the content shell, and
|
| - # this combination is not yet supported on Android.
|
| - '../webkit/support/webkit_support.gyp:webkit_support',
|
| - ],
|
| - }, { # else: OS=="android"
|
| + ['OS=="android"', {
|
| 'dependencies': [
|
| 'content_shell_jni_headers',
|
| ],
|
| 'include_dirs': [
|
| '<(SHARED_INTERMEDIATE_DIR)/content/shell',
|
| ],
|
| + 'sources!': [
|
| + 'shell/shell_devtools_delegate.cc',
|
| + ],
|
| + }, { # else: OS!="android"
|
| + 'dependencies': [
|
| + # This dependency is for running DRT against the content shell, and
|
| + # this combination is not yet supported on Android.
|
| + '../webkit/support/webkit_support.gyp:webkit_support',
|
| + ],
|
| }], # OS=="android"
|
| ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', {
|
| 'dependencies': [
|
|
|