| OLD | NEW |
| 1 { | 1 { |
| 2 'includes': [ | 2 'includes': [ |
| 3 'extensions_tests.gypi', | 3 'extensions_tests.gypi', |
| 4 ], | 4 ], |
| 5 'variables': { | 5 'variables': { |
| 6 # Product name is used for Mac bundle. | 6 # Product name is used for Mac bundle. |
| 7 'app_shell_product_name': 'App Shell', | 7 'app_shell_product_name': 'App Shell', |
| 8 # The version is high enough to be supported by Omaha (at least 31) | 8 # The version is high enough to be supported by Omaha (at least 31) |
| 9 # but fake enough to be obviously not a Chrome release. | 9 # but fake enough to be obviously not a Chrome release. |
| 10 'app_shell_version': '38.1234.5678.9', | 10 'app_shell_version': '38.1234.5678.9', |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', | 36 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', |
| 37 'common/api/api.gyp:cast_channel_proto', | 37 'common/api/api.gyp:cast_channel_proto', |
| 38 'extensions.gyp:extensions_browser', | 38 'extensions.gyp:extensions_browser', |
| 39 'extensions.gyp:extensions_common', | 39 'extensions.gyp:extensions_common', |
| 40 'extensions.gyp:extensions_renderer', | 40 'extensions.gyp:extensions_renderer', |
| 41 'extensions.gyp:extensions_shell_and_test_pak', | 41 'extensions.gyp:extensions_shell_and_test_pak', |
| 42 'extensions.gyp:extensions_test_support', | 42 'extensions.gyp:extensions_test_support', |
| 43 'extensions.gyp:extensions_utility', | 43 'extensions.gyp:extensions_utility', |
| 44 'extensions_resources.gyp:extensions_resources', | 44 'extensions_resources.gyp:extensions_resources', |
| 45 'extensions_strings.gyp:extensions_strings', | 45 'extensions_strings.gyp:extensions_strings', |
| 46 # Only needed at runtime. |
| 47 '../third_party/mesa/mesa.gyp:osmesa', |
| 46 ], | 48 ], |
| 47 # Needed for third_party libraries like leveldb. | 49 # Needed for third_party libraries like leveldb. |
| 48 'include_dirs': [ | 50 'include_dirs': [ |
| 49 '..', | 51 '..', |
| 50 ], | 52 ], |
| 51 'sources': [ | 53 'sources': [ |
| 52 '<@(extensions_unittests_sources)', | 54 '<@(extensions_unittests_sources)', |
| 53 ], | 55 ], |
| 54 # Disable c4267 warnings until we fix size_t to int truncations. | 56 # Disable c4267 warnings until we fix size_t to int truncations. |
| 55 'msvs_disabled_warnings': [ 4267, ], | 57 'msvs_disabled_warnings': [ 4267, ], |
| (...skipping 22 matching lines...) Expand all Loading... |
| 78 '<(DEPTH)/components/components.gyp:guest_view_browser', | 80 '<(DEPTH)/components/components.gyp:guest_view_browser', |
| 79 '<(DEPTH)/components/components.gyp:guest_view_renderer', | 81 '<(DEPTH)/components/components.gyp:guest_view_renderer', |
| 80 '<(DEPTH)/components/components.gyp:guest_view_test_support', | 82 '<(DEPTH)/components/components.gyp:guest_view_test_support', |
| 81 '<(DEPTH)/content/content.gyp:content_app_both', | 83 '<(DEPTH)/content/content.gyp:content_app_both', |
| 82 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo
rt', | 84 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo
rt', |
| 83 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', | 85 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', |
| 84 '<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', | 86 '<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks', |
| 85 '<(DEPTH)/device/usb/usb.gyp:device_usb_mocks', | 87 '<(DEPTH)/device/usb/usb.gyp:device_usb_mocks', |
| 86 '<(DEPTH)/testing/gmock.gyp:gmock', | 88 '<(DEPTH)/testing/gmock.gyp:gmock', |
| 87 '<(DEPTH)/testing/gtest.gyp:gtest', | 89 '<(DEPTH)/testing/gtest.gyp:gtest', |
| 90 # Only needed at runtime. |
| 91 '../third_party/mesa/mesa.gyp:osmesa', |
| 88 ], | 92 ], |
| 89 'defines': [ | 93 'defines': [ |
| 90 'HAS_OUT_OF_PROC_TEST_RUNNER', | 94 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 91 ], | 95 ], |
| 92 'sources': [ | 96 'sources': [ |
| 93 '<@(extensions_browsertests_sources)', | 97 '<@(extensions_browsertests_sources)', |
| 94 ], | 98 ], |
| 95 'conditions': [ | 99 'conditions': [ |
| 96 ['OS=="win" and win_use_allocator_shim==1', { | 100 ['OS=="win" and win_use_allocator_shim==1', { |
| 97 'dependencies': [ | 101 'dependencies': [ |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 'dependencies': [ | 150 'dependencies': [ |
| 147 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 151 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 148 ], | 152 ], |
| 149 }], | 153 }], |
| 150 ], | 154 ], |
| 151 } | 155 } |
| 152 ], | 156 ], |
| 153 }], | 157 }], |
| 154 ], | 158 ], |
| 155 } | 159 } |
| OLD | NEW |