| 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 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 ], | 49 ], |
| 50 }], | 50 }], |
| 51 ['OS == "android"', { | 51 ['OS == "android"', { |
| 52 'targets': [ | 52 'targets': [ |
| 53 { | 53 { |
| 54 # TODO(tfarina): Remove this target after all traces of it are updated | 54 # TODO(tfarina): Remove this target after all traces of it are updated |
| 55 # to point to ui_base_unittests_apk. crbug.com/331829 | 55 # to point to ui_base_unittests_apk. crbug.com/331829 |
| 56 'target_name': 'ui_unittests_apk', | 56 'target_name': 'ui_unittests_apk', |
| 57 'type': 'none', | 57 'type': 'none', |
| 58 'dependencies': [ | 58 'dependencies': [ |
| 59 # TODO(tfarina): This is a layer violation and should be removed. |
| 60 # crbug.com/176960 |
| 61 # For now this is here as a temporary band-aid to fix the clobber |
| 62 # issue we are seeing when running this target on Android. |
| 63 # crbug.com/374490 |
| 64 '../../chrome/chrome_resources.gyp:packed_resources', |
| 59 'ui_unittests', | 65 'ui_unittests', |
| 60 ], | 66 ], |
| 61 'variables': { | 67 'variables': { |
| 62 'test_suite_name': 'ui_unittests', | 68 'test_suite_name': 'ui_unittests', |
| 63 }, | 69 }, |
| 64 'includes': [ '../../build/apk_test.gypi' ], | 70 'includes': [ '../../build/apk_test.gypi' ], |
| 65 }, | 71 }, |
| 66 { | 72 { |
| 67 'target_name': 'ui_base_unittests_apk', | 73 'target_name': 'ui_base_unittests_apk', |
| 68 'type': 'none', | 74 'type': 'none', |
| 69 'dependencies': [ | 75 'dependencies': [ |
| 76 # TODO(tfarina): This is a layer violation and should be removed. |
| 77 # crbug.com/176960 |
| 78 # For now this is here as a temporary band-aid to fix the clobber |
| 79 # issue we are seeing when running this target on Android. |
| 80 # crbug.com/374490 |
| 81 '../../chrome/chrome_resources.gyp:packed_resources', |
| 70 'ui_base_unittests', | 82 'ui_base_unittests', |
| 71 ], | 83 ], |
| 72 'variables': { | 84 'variables': { |
| 73 'test_suite_name': 'ui_base_unittests', | 85 'test_suite_name': 'ui_base_unittests', |
| 74 }, | 86 }, |
| 75 'includes': [ '../../build/apk_test.gypi' ], | 87 'includes': [ '../../build/apk_test.gypi' ], |
| 76 }, | 88 }, |
| 77 ], | 89 ], |
| 78 }], | 90 }], |
| 79 ], | 91 ], |
| 80 } | 92 } |
| OLD | NEW |