| 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, | 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 | 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 | 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 | 14 # latter includes mojo/edk/system/memory.h, the header from third_party |
| 15 # would incorrectly get chosen). | 15 # would incorrectly get chosen). |
| 16 '../..', | 16 '../..', |
| 17 'src', | |
| 18 ], | 17 ], |
| 19 'direct_dependent_settings': { | |
| 20 'include_dirs': [ | |
| 21 'src', | |
| 22 ], | |
| 23 }, | |
| 24 }, | 18 }, |
| 25 'targets': [ | 19 'targets': [ |
| 26 { | 20 { |
| 27 # GN version: //mojo/edk/system | 21 # GN version: //mojo/edk/system |
| 28 'target_name': 'mojo_system_impl', | 22 'target_name': 'mojo_system_impl', |
| 29 'type': '<(component)', | 23 'type': '<(component)', |
| 30 'dependencies': [ | 24 'dependencies': [ |
| 31 '../../base/base.gyp:base', | 25 '../../base/base.gyp:base', |
| 32 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna
mic_annotations', | 26 '../../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 | 27 # TODO(use_chrome_edk): so that EDK in third_party can choose the EDK in |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 'configurations': { | 151 'configurations': { |
| 158 'Common_Base': { | 152 'Common_Base': { |
| 159 'msvs_target_platform': 'x64', | 153 'msvs_target_platform': 'x64', |
| 160 }, | 154 }, |
| 161 }, | 155 }, |
| 162 }, | 156 }, |
| 163 ], | 157 ], |
| 164 }], | 158 }], |
| 165 ], | 159 ], |
| 166 } | 160 } |
| OLD | NEW |