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

Side by Side Diff: third_party/mojo/mojo_variables.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 | « third_party/mojo/mojo_public.gyp ('k') | third_party/mojo/mojom_bindings_generator.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # A set of GYP variables that are shared between various mojo .gyp files. 6 # A set of GYP variables that are shared between various mojo .gyp files.
7 # 7 #
8 { 8 {
9 'variables': { 9 'variables': {
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 14 matching lines...) Expand all
25 # add <(mojo_system_for_loadable_module) to your dependencies section. 25 # add <(mojo_system_for_loadable_module) to your dependencies section.
26 # 26 #
27 # NOTE: component != "shared_library" implies that we are generating a 27 # NOTE: component != "shared_library" implies that we are generating a
28 # static library, and in that case, it is expected that the target 28 # static library, and in that case, it is expected that the target
29 # listing the component as a dependency will specify either mojo_system 29 # listing the component as a dependency will specify either mojo_system
30 # or mojo_system_impl to link against. This enables multiple targets to 30 # or mojo_system_impl to link against. This enables multiple targets to
31 # link against the same component library without having to agree on 31 # link against the same component library without having to agree on
32 # which Mojo system library they are using. 32 # which Mojo system library they are using.
33 # 33 #
34 ['component=="shared_library"', { 34 ['component=="shared_library"', {
35 'mojo_system_for_component': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_imp l",
36 'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_edk.gyp:mojo_syst em_impl",
37 'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_gles2_impl ", 35 'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_gles2_impl ",
36 'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_edk.gyp:moj o_system_impl",
37 'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_edk.g yp:mojo_system_impl",
38 }, { 38 }, {
39 'mojo_system_for_component': "<(DEPTH)/mojo/mojo_public.gyp:mojo_system_ placeholder",
40 'mojo_system_for_loadable_module': "<(DEPTH)/mojo/mojo_public.gyp:mojo_s ystem",
41 'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none", 39 'mojo_gles2_for_component': "<(DEPTH)/mojo/mojo_base.gyp:mojo_none",
40 'mojo_system_for_component': "<(DEPTH)/third_party/mojo/mojo_public.gyp: mojo_system_placeholder",
41 'mojo_system_for_loadable_module': "<(DEPTH)/third_party/mojo/mojo_publi c.gyp:mojo_system",
42 }], 42 }],
43 ], 43 ],
44 'mojo_public_system_unittest_sources': [ 44 'mojo_public_system_unittest_sources': [
45 '<(DEPTH)/mojo/public/c/system/tests/core_unittest.cc', 45 '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest.cc ',
46 '<(DEPTH)/mojo/public/c/system/tests/core_unittest_pure_c.c', 46 '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/core_unittest_pu re_c.c',
47 '<(DEPTH)/mojo/public/c/system/tests/macros_unittest.cc', 47 '<(DEPTH)/third_party/mojo/src/mojo/public/c/system/tests/macros_unittest. cc',
48 '<(DEPTH)/mojo/public/cpp/system/tests/core_unittest.cc', 48 '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/core_unittest. cc',
49 '<(DEPTH)/mojo/public/cpp/system/tests/macros_unittest.cc', 49 '<(DEPTH)/third_party/mojo/src/mojo/public/cpp/system/tests/macros_unittes t.cc',
50 ], 50 ],
51 }, 51 },
52 } 52 }
OLDNEW
« no previous file with comments | « third_party/mojo/mojo_public.gyp ('k') | third_party/mojo/mojom_bindings_generator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698