| 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 ] | 111 ] |
| 112 }, | 112 }, |
| 113 ], | 113 ], |
| 114 'conditions': [ | 114 'conditions': [ |
| 115 ['test_isolation_mode != "noop"', { | 115 ['test_isolation_mode != "noop"', { |
| 116 'targets': [ | 116 'targets': [ |
| 117 { | 117 { |
| 118 'target_name': 'extensions_browsertests_run', | 118 'target_name': 'extensions_browsertests_run', |
| 119 'type': 'none', | 119 'type': 'none', |
| 120 'dependencies': [ | 120 'dependencies': [ |
| 121 '../third_party/mesa/mesa.gyp:osmesa', |
| 121 'extensions_browsertests', | 122 'extensions_browsertests', |
| 122 ], | 123 ], |
| 123 'includes': [ | 124 'includes': [ |
| 124 '../build/isolate.gypi', | 125 '../build/isolate.gypi', |
| 125 ], | 126 ], |
| 126 'sources': [ | 127 'sources': [ |
| 127 'extensions_browsertests.isolate', | 128 'extensions_browsertests.isolate', |
| 128 ], | 129 ], |
| 129 }, | 130 }, |
| 130 { | 131 { |
| 131 'target_name': 'extensions_unittests_run', | 132 'target_name': 'extensions_unittests_run', |
| 132 'type': 'none', | 133 'type': 'none', |
| 133 'dependencies': [ | 134 'dependencies': [ |
| 135 '../third_party/mesa/mesa.gyp:osmesa', |
| 134 'extensions_unittests', | 136 'extensions_unittests', |
| 135 ], | 137 ], |
| 136 'includes': [ | 138 'includes': [ |
| 137 '../build/isolate.gypi', | 139 '../build/isolate.gypi', |
| 138 ], | 140 ], |
| 139 'sources': [ | 141 'sources': [ |
| 140 'extensions_unittests.isolate', | 142 'extensions_unittests.isolate', |
| 141 ], | 143 ], |
| 142 'conditions': [ | 144 'conditions': [ |
| 143 ['use_x11 == 1', { | 145 ['use_x11 == 1', { |
| 144 'dependencies': [ | 146 'dependencies': [ |
| 145 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 147 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 146 ], | 148 ], |
| 147 }], | 149 }], |
| 148 ], | 150 ], |
| 149 } | 151 } |
| 150 ], | 152 ], |
| 151 }], | 153 }], |
| 152 ], | 154 ], |
| 153 } | 155 } |
| OLD | NEW |