| OLD | NEW |
| 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 'includes': [ | 6 'includes': [ |
| 7 'mojo_variables.gypi', | 7 'mojo_variables.gypi', |
| 8 ], | 8 ], |
| 9 'target_defaults' : { | 9 'target_defaults' : { |
| 10 'include_dirs': [ | 10 'include_dirs': [ |
| 11 # TODO(use_chrome_edk): since we include a few headers from src/mojo/edk, |
| 12 # we need their includes to be searched first (i.e. otherwise when |
| 13 # embedder.cc in third_party includes core.h from src/mojo/edk, and the |
| 14 # latter includes mojo/edk/system/memory.h, the header from third_party |
| 15 # would incorrectly get chosen). |
| 16 '../..', |
| 11 'src', | 17 'src', |
| 12 ], | 18 ], |
| 13 'direct_dependent_settings': { | 19 'direct_dependent_settings': { |
| 14 'include_dirs': [ | 20 'include_dirs': [ |
| 15 'src', | 21 'src', |
| 16 ], | 22 ], |
| 17 }, | 23 }, |
| 18 }, | 24 }, |
| 19 'targets': [ | 25 'targets': [ |
| 20 { | 26 { |
| 21 # GN version: //mojo/edk/system | 27 # GN version: //mojo/edk/system |
| 22 'target_name': 'mojo_system_impl', | 28 'target_name': 'mojo_system_impl', |
| 23 'type': '<(component)', | 29 'type': '<(component)', |
| 24 'dependencies': [ | 30 'dependencies': [ |
| 25 '../../base/base.gyp:base', | 31 '../../base/base.gyp:base', |
| 26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna
mic_annotations', | 32 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna
mic_annotations', |
| 33 # TODO(use_chrome_edk): so that EDK in third_party can choose the EDK in |
| 34 # src/mojo if the command line flag is specified. It has to since we can |
| 35 # only have one definition of the Mojo primitives. |
| 36 '../../mojo/mojo_edk.gyp:mojo_system_impl2', |
| 27 ], | 37 ], |
| 28 'includes': [ | 38 'includes': [ |
| 29 'mojo_edk_system_impl.gypi', | 39 'mojo_edk_system_impl.gypi', |
| 30 ], | 40 ], |
| 31 }, | 41 }, |
| 32 { | 42 { |
| 33 # GN version: //mojo/edk/js | 43 # GN version: //mojo/edk/js |
| 34 'target_name': 'mojo_js_lib', | 44 'target_name': 'mojo_js_lib', |
| 35 'type': 'static_library', | 45 'type': 'static_library', |
| 36 'dependencies': [ | 46 'dependencies': [ |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 'configurations': { | 157 'configurations': { |
| 148 'Common_Base': { | 158 'Common_Base': { |
| 149 'msvs_target_platform': 'x64', | 159 'msvs_target_platform': 'x64', |
| 150 }, | 160 }, |
| 151 }, | 161 }, |
| 152 }, | 162 }, |
| 153 ], | 163 ], |
| 154 }], | 164 }], |
| 155 ], | 165 ], |
| 156 } | 166 } |
| OLD | NEW |