Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(509)

Side by Side Diff: content/content_browser.gypi

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/content_app.gypi ('k') | content/content_child.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base_static', 7 '../base/base.gyp:base_static',
8 '../crypto/crypto.gyp:crypto', 8 '../crypto/crypto.gyp:crypto',
9 '../device/battery/battery.gyp:device_battery', 9 '../device/battery/battery.gyp:device_battery',
10 '../device/battery/battery.gyp:device_battery_mojo_bindings', 10 '../device/battery/battery.gyp:device_battery_mojo_bindings',
(...skipping 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after
1657 ['include', '^browser/signed_certificate_timestamp_store_impl\\.cc$'], 1657 ['include', '^browser/signed_certificate_timestamp_store_impl\\.cc$'],
1658 ['include', '^browser/user_metrics\\.cc$'], 1658 ['include', '^browser/user_metrics\\.cc$'],
1659 ['include', '^browser/web_contents/navigation_entry_impl\\.cc$'], 1659 ['include', '^browser/web_contents/navigation_entry_impl\\.cc$'],
1660 ], 1660 ],
1661 }, { # OS!="ios" 1661 }, { # OS!="ios"
1662 'dependencies': [ 1662 'dependencies': [
1663 'app/resources/content_resources.gyp:content_resources', 1663 'app/resources/content_resources.gyp:content_resources',
1664 'app/strings/content_strings.gyp:content_strings', 1664 'app/strings/content_strings.gyp:content_strings',
1665 'browser/devtools/devtools_resources.gyp:devtools_resources', 1665 'browser/devtools/devtools_resources.gyp:devtools_resources',
1666 'browser/devtools/devtools.gyp:devtools_protocol_handler', 1666 'browser/devtools/devtools.gyp:devtools_protocol_handler',
1667 'content_common_mojo_bindings',
1668 '../cc/cc.gyp:cc', 1667 '../cc/cc.gyp:cc',
1669 '../cc/cc.gyp:cc_surfaces', 1668 '../cc/cc.gyp:cc_surfaces',
1670 '../mojo/public/mojo_public.gyp:mojo_application_bindings',
1671 '../mojo/public/mojo_public.gyp:mojo_cpp_bindings', 1669 '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
1672 '../mojo/public/mojo_public.gyp:mojo_js_bindings', 1670 '../mojo/public/mojo_public.gyp:mojo_js_bindings',
1673 '../net/net.gyp:http_server', 1671 '../net/net.gyp:http_server',
1674 '../storage/storage_browser.gyp:storage', 1672 '../storage/storage_browser.gyp:storage',
1675 '../storage/storage_common.gyp:storage_common', 1673 '../storage/storage_common.gyp:storage_common',
1676 '../third_party/angle/src/angle.gyp:commit_id', 1674 '../third_party/angle/src/angle.gyp:commit_id',
1677 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 1675 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
1678 '../ui/surface/surface.gyp:surface', 1676 '../ui/surface/surface.gyp:surface',
1679 ], 1677 ],
1680 }], 1678 }],
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
1936 'sources': [ 1934 'sources': [
1937 'browser/media/cdm/browser_cdm_manager.cc', 1935 'browser/media/cdm/browser_cdm_manager.cc',
1938 'browser/media/cdm/browser_cdm_manager.h', 1936 'browser/media/cdm/browser_cdm_manager.h',
1939 # This works on Android because enable_browser_cdms==1 on Android. 1937 # This works on Android because enable_browser_cdms==1 on Android.
1940 'browser/media/media_web_contents_observer.cc', 1938 'browser/media/media_web_contents_observer.cc',
1941 'browser/media/media_web_contents_observer.h', 1939 'browser/media/media_web_contents_observer.h',
1942 ], 1940 ],
1943 }], 1941 }],
1944 ], 1942 ],
1945 } 1943 }
OLDNEW
« no previous file with comments | « content/content_app.gypi ('k') | content/content_child.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698