| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 # Defines an extra set of libs with an alternate copy of org.apache.http. | 8 # Defines an extra set of libs with an alternate copy of org.apache.http. |
| 9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed. | 9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed. |
| 10 'net_test_extra_libs': [], | 10 'net_test_extra_libs': [], |
| (...skipping 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1496 'files': [ | 1496 'files': [ |
| 1497 '<(PRODUCT_DIR)/natives_blob.bin', | 1497 '<(PRODUCT_DIR)/natives_blob.bin', |
| 1498 '<(PRODUCT_DIR)/snapshot_blob.bin', | 1498 '<(PRODUCT_DIR)/snapshot_blob.bin', |
| 1499 ], | 1499 ], |
| 1500 }, | 1500 }, |
| 1501 ], | 1501 ], |
| 1502 }], | 1502 }], |
| 1503 ], | 1503 ], |
| 1504 'variables': { | 1504 'variables': { |
| 1505 'test_suite_name': 'net_unittests', | 1505 'test_suite_name': 'net_unittests', |
| 1506 'isolate_file': 'net_unittests.isolate', |
| 1506 'conditions': [ | 1507 'conditions': [ |
| 1507 ['v8_use_external_startup_data==1', { | 1508 ['v8_use_external_startup_data==1', { |
| 1508 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', | 1509 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', |
| 1509 'additional_input_paths': [ | 1510 'additional_input_paths': [ |
| 1510 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin', | 1511 '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin', |
| 1511 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin', | 1512 '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin', |
| 1512 ], | 1513 ], |
| 1513 'inputs': [ | 1514 'inputs': [ |
| 1514 '<(PRODUCT_DIR)/natives_blob.bin', | 1515 '<(PRODUCT_DIR)/natives_blob.bin', |
| 1515 '<(PRODUCT_DIR)/snapshot_blob.bin', | 1516 '<(PRODUCT_DIR)/snapshot_blob.bin', |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1548 '../build/isolate.gypi', | 1549 '../build/isolate.gypi', |
| 1549 ], | 1550 ], |
| 1550 'sources': [ | 1551 'sources': [ |
| 1551 'net_unittests.isolate', | 1552 'net_unittests.isolate', |
| 1552 ], | 1553 ], |
| 1553 }, | 1554 }, |
| 1554 ], | 1555 ], |
| 1555 }], | 1556 }], |
| 1556 ], | 1557 ], |
| 1557 } | 1558 } |
| OLD | NEW |