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

Side by Side Diff: content/content_common.gypi

Issue 814543006: Move //mojo/{public, edk} underneath //third_party (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 months 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_browser.gypi ('k') | content/content_common_mojo_bindings.gyp » ('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', 7 '../base/base.gyp:base',
8 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 # TODO: the dependency on gl_in_process_context should be decoupled from 569 # TODO: the dependency on gl_in_process_context should be decoupled from
570 # content and moved to android_webview. See crbug.com/365797. 570 # content and moved to android_webview. See crbug.com/365797.
571 '../gpu/gpu.gyp:gl_in_process_context', 571 '../gpu/gpu.gyp:gl_in_process_context',
572 '../gpu/gpu.gyp:gpu_ipc', 572 '../gpu/gpu.gyp:gpu_ipc',
573 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', 573 '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
574 '../ipc/ipc.gyp:ipc', 574 '../ipc/ipc.gyp:ipc',
575 '../ipc/mojo/ipc_mojo.gyp:ipc_mojo', 575 '../ipc/mojo/ipc_mojo.gyp:ipc_mojo',
576 '../media/media.gyp:media', 576 '../media/media.gyp:media',
577 '../media/media.gyp:shared_memory_support', 577 '../media/media.gyp:shared_memory_support',
578 '../mojo/mojo_base.gyp:mojo_environment_chromium', 578 '../mojo/mojo_base.gyp:mojo_environment_chromium',
579 '../mojo/mojo_edk.gyp:mojo_system_impl',
580 '../mojo/mojo_public.gyp:mojo_application_bindings',
581 '../mojo/mojo_public.gyp:mojo_cpp_bindings',
582 '../storage/storage_common.gyp:storage_common', 579 '../storage/storage_common.gyp:storage_common',
583 '../third_party/WebKit/public/blink.gyp:blink', 580 '../third_party/WebKit/public/blink.gyp:blink',
581 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
582 '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
583 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
584 '../ui/gl/gl.gyp:gl', 584 '../ui/gl/gl.gyp:gl',
585 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 585 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
586 ], 586 ],
587 'export_dependent_settings' : [ 587 'export_dependent_settings' : [
588 '../mojo/mojo_public.gyp:mojo_application_bindings', 588 '../third_party/mojo/mojo_public.gyp:mojo_application_bindings',
589 '../mojo/mojo_public.gyp:mojo_cpp_bindings', 589 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
590 ], 590 ],
591 'actions': [ 591 'actions': [
592 { 592 {
593 'action_name': 'generate_webkit_version', 593 'action_name': 'generate_webkit_version',
594 'inputs': [ 594 'inputs': [
595 '<(script)', 595 '<(script)',
596 '<(lastchange)', 596 '<(lastchange)',
597 '<(template)', 597 '<(template)',
598 ], 598 ],
599 'outputs': [ 599 'outputs': [
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc', 1033 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
1034 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc', 1034 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc',
1035 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h', 1035 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h',
1036 'common/gpu/gpu_memory_buffer_factory_ozone.cc', 1036 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
1037 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc', 1037 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc',
1038 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h', 1038 'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h',
1039 ], 1039 ],
1040 }], 1040 }],
1041 ], 1041 ],
1042 } 1042 }
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/content_common_mojo_bindings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698