Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'content_shell_product_name': 'Content Shell', | 7 'content_shell_product_name': 'Content Shell', |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 'content_shell_resources', | 25 'content_shell_resources', |
| 26 'content_utility', | 26 'content_utility', |
| 27 'content_worker', | 27 'content_worker', |
| 28 'content_resources.gyp:content_resources', | 28 'content_resources.gyp:content_resources', |
| 29 '../base/base.gyp:base', | 29 '../base/base.gyp:base', |
| 30 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', | 30 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', |
| 31 '../build/temp_gyp/googleurl.gyp:googleurl', | 31 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 32 '../ipc/ipc.gyp:ipc', | 32 '../ipc/ipc.gyp:ipc', |
| 33 '../media/media.gyp:media', | 33 '../media/media.gyp:media', |
| 34 '../net/net.gyp:net', | 34 '../net/net.gyp:net', |
| 35 '../net/net.gyp:net_resources', | |
| 35 '../skia/skia.gyp:skia', | 36 '../skia/skia.gyp:skia', |
| 36 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', | |
| 37 '../ui/ui.gyp:ui', | 37 '../ui/ui.gyp:ui', |
| 38 '../v8/tools/gyp/v8.gyp:v8', | 38 '../v8/tools/gyp/v8.gyp:v8', |
| 39 '../webkit/support/webkit_support.gyp:webkit_support', | 39 '../webkit/support/webkit_support.gyp:webkit_support', |
| 40 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', | |
| 40 ], | 41 ], |
| 41 'include_dirs': [ | 42 'include_dirs': [ |
| 42 '..', | 43 '..', |
| 43 ], | 44 ], |
| 44 'sources': [ | 45 'sources': [ |
| 45 'shell/geolocation/shell_access_token_store.cc', | 46 'shell/geolocation/shell_access_token_store.cc', |
| 46 'shell/geolocation/shell_access_token_store.h', | 47 'shell/geolocation/shell_access_token_store.h', |
| 47 'shell/layout_test_controller.cc', | 48 'shell/layout_test_controller.cc', |
| 48 'shell/layout_test_controller.h', | 49 'shell/layout_test_controller.h', |
| 49 'shell/layout_test_controller_bindings.cc', | 50 'shell/layout_test_controller_bindings.cc', |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 232 ], | 233 ], |
| 233 }, | 234 }, |
| 234 { | 235 { |
| 235 # We build a minimal set of resources so WebKit in content_shell has | 236 # We build a minimal set of resources so WebKit in content_shell has |
| 236 # access to necessary resources. | 237 # access to necessary resources. |
| 237 'target_name': 'content_shell_pak', | 238 'target_name': 'content_shell_pak', |
| 238 'type': 'none', | 239 'type': 'none', |
| 239 'dependencies': [ | 240 'dependencies': [ |
| 240 'browser/debugger/devtools_resources.gyp:devtools_resources', | 241 'browser/debugger/devtools_resources.gyp:devtools_resources', |
| 241 'content_shell_resources', | 242 'content_shell_resources', |
| 242 '<(DEPTH)/net/net.gyp:net_resources', | |
|
jochen (gone - plz use gerrit)
2012/08/13 09:43:46
why is this move required?
jam
2012/08/13 15:07:25
in patchset 1, I tried putting net.gyp:net_resourc
| |
| 243 '<(DEPTH)/ui/ui.gyp:ui_resources', | 243 '<(DEPTH)/ui/ui.gyp:ui_resources', |
| 244 ], | 244 ], |
| 245 'variables': { | 245 'variables': { |
| 246 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', | 246 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', |
| 247 }, | 247 }, |
| 248 'actions': [ | 248 'actions': [ |
| 249 { | 249 { |
| 250 'action_name': 'repack_content_shell_pack', | 250 'action_name': 'repack_content_shell_pack', |
| 251 'variables': { | 251 'variables': { |
| 252 'pak_inputs': [ | 252 'pak_inputs': [ |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 663 'dependencies': [ | 663 'dependencies': [ |
| 664 'content_java', | 664 'content_java', |
| 665 ], | 665 ], |
| 666 } | 666 } |
| 667 ], | 667 ], |
| 668 }, | 668 }, |
| 669 ], | 669 ], |
| 670 }], # OS=="android" | 670 }], # OS=="android" |
| 671 ] | 671 ] |
| 672 } | 672 } |
| OLD | NEW |