Chromium Code Reviews| Index: content/content_tests.gypi |
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
| index 7a12314b5fca25e979523e1bbb6365fcc7fd7f06..c4b3734ac2891a8e7cbd7953741eb92d5deb4a9f 100644 |
| --- a/content/content_tests.gypi |
| +++ b/content/content_tests.gypi |
| @@ -817,31 +817,31 @@ |
| 'renderer/media/rtc_video_decoder_factory_tv_unittest.cc', |
| ], |
| }], |
| - ['use_dbus==0', { |
|
bulach
2014/01/10 09:16:30
my editor is configured to replace tabs, I'm happy
|
| + ['use_dbus==0', { |
| 'sources!': [ |
| 'browser/geolocation/wifi_data_provider_linux_unittest.cc', |
| ], |
| - }], |
| + }], |
| ], |
| }, |
| ], |
| 'conditions': [ |
| ['test_isolation_mode != "noop"', { |
| 'targets': [ |
| - { |
| - 'target_name': 'content_unittests_run', |
| - 'type': 'none', |
| - 'dependencies': [ |
| - 'content_unittests', |
| - ], |
| - 'includes': [ |
| - '../build/isolate.gypi', |
| - 'content_unittests.isolate', |
| - ], |
| - 'sources': [ |
| - 'content_unittests.isolate', |
| - ], |
| - }, |
| + { |
| + 'target_name': 'content_unittests_run', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'content_unittests', |
| + ], |
| + 'includes': [ |
| + '../build/isolate.gypi', |
| + 'content_unittests.isolate', |
| + ], |
| + 'sources': [ |
| + 'content_unittests.isolate', |
| + ], |
| + }, |
| ], |
| }], |
| ['OS!="ios"', { |
| @@ -1441,6 +1441,7 @@ |
| ], |
| 'variables': { |
| 'jni_gen_package': 'content/shell', |
| + 'jni_generator_ptr_type': 'long', |
| }, |
| 'includes': [ '../build/jni_generator.gypi' ], |
| }, |
| @@ -1468,6 +1469,7 @@ |
| ], |
| 'variables': { |
| 'jni_gen_package': 'content/public/test', |
| + 'jni_generator_ptr_type': 'long', |
| }, |
| 'includes': [ '../build/jni_generator.gypi' ], |
| }, |