Chromium Code Reviews| Index: sql/sql.gyp |
| diff --git a/sql/sql.gyp b/sql/sql.gyp |
| index 86cfbc9160c71ebb123acbca8aba9453c80d0e43..78f034a93dadd72b9f5d71db9154bbae994737cf 100644 |
| --- a/sql/sql.gyp |
| +++ b/sql/sql.gyp |
| @@ -14,7 +14,15 @@ |
| '../base/base.gyp:base', |
| '../third_party/sqlite/sqlite.gyp:sqlite', |
| ], |
| + 'export_dependent_settings': [ |
| + '../base/base.gyp:base', |
| + ], |
| 'defines': [ 'SQL_IMPLEMENTATION' ], |
| + 'direct_dependent_settings': { |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + }, |
| 'sources': [ |
| 'connection.cc', |
| 'connection.h', |
| @@ -28,14 +36,35 @@ |
| 'transaction.cc', |
| 'transaction.h', |
| ], |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 'msvs_disabled_warnings': [4267, ], |
| }, |
| { |
| + 'target_name': 'test_support_sql', |
| + 'type': 'static_library', |
| + 'dependencies': [ |
| + 'sql', |
| + '../base/base.gyp:base', |
| + '../testing/gtest.gyp:gtest', |
| + ], |
| + 'export_dependent_settings': [ |
|
erikwright (departed)
2013/06/17 17:42:30
nit, add 'include_dirs' -> '..' here too.
Scott Hess - ex-Googler
2013/06/17 20:54:59
I am taking this to mean an include_dirs stanza fo
|
| + 'sql', |
| + '../base/base.gyp:base', |
| + ], |
| + 'sources': [ |
| + 'test/scoped_error_ignorer.cc', |
| + 'test/scoped_error_ignorer.h', |
| + ], |
| + }, |
| + { |
| 'target_name': 'sql_unittests', |
| 'type': '<(gtest_target_type)', |
| 'dependencies': [ |
| 'sql', |
| + 'test_support_sql', |
| '../base/base.gyp:test_support_base', |
| '../testing/gtest.gyp:gtest', |
| ], |