Index: third_party/mojo/mojo_edk.gyp |
diff --git a/third_party/mojo/mojo_edk.gyp b/third_party/mojo/mojo_edk.gyp |
index 0b5b475fc9d6e8da2191be16de058e6b17634418..220383c5f5e2742b2c5487e0a8ac034637ba0e9f 100644 |
--- a/third_party/mojo/mojo_edk.gyp |
+++ b/third_party/mojo/mojo_edk.gyp |
@@ -8,6 +8,12 @@ |
], |
'target_defaults' : { |
'include_dirs': [ |
+ # TODO(use_chrome_edk): since we include a few headers from src/mojo/edk, |
+ # we need their includes to be searched first (i.e. otherwise when |
+ # embedder.cc in third_party includes core.h from src/mojo/edk, and the |
+ # latter includes mojo/edk/system/memory.h, the header from third_party |
+ # would incorrectly get chosen). |
+ '../..', |
'src', |
], |
'direct_dependent_settings': { |
@@ -24,6 +30,10 @@ |
'dependencies': [ |
'../../base/base.gyp:base', |
'../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
+ # TODO(use_chrome_edk): so that EDK in third_party can choose the EDK in |
+ # src/mojo if the command line flag is specified. It has to since we can |
+ # only have one definition of the Mojo primitives. |
+ '../../mojo/mojo_edk.gyp:mojo_system_impl2', |
], |
'includes': [ |
'mojo_edk_system_impl.gypi', |