| OLD | NEW |
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 2012 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 'variables': { | 5 'variables': { |
| 6 'chrome_unit_tests_sources': [ | 6 'chrome_unit_tests_sources': [ |
| 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this | 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this |
| 8 # dependency is needed to make commit bots run unit_tests on | 8 # dependency is needed to make commit bots run unit_tests on |
| 9 # histograms.xml changes. | 9 # histograms.xml changes. |
| 10 '../tools/metrics/histograms/histograms.xml', | 10 '../tools/metrics/histograms/histograms.xml', |
| (...skipping 2631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2642 'ldflags': [ | 2642 'ldflags': [ |
| 2643 # Some android targets still depend on --gc-sections to link. | 2643 # Some android targets still depend on --gc-sections to link. |
| 2644 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). | 2644 # TODO: remove --gc-sections for Debug builds (crbug.com/159847). |
| 2645 '-Wl,--gc-sections', | 2645 '-Wl,--gc-sections', |
| 2646 ], | 2646 ], |
| 2647 'dependencies': [ | 2647 'dependencies': [ |
| 2648 '../testing/android/native_test.gyp:native_test_native_code', | 2648 '../testing/android/native_test.gyp:native_test_native_code', |
| 2649 ], | 2649 ], |
| 2650 }, { # Not Android. | 2650 }, { # Not Android. |
| 2651 'sources': [ '<@(chrome_unit_tests_non_android_sources)' ], | 2651 'sources': [ '<@(chrome_unit_tests_non_android_sources)' ], |
| 2652 'sources!': [ |
| 2653 'browser/download/download_request_infobar_delegate_unittest.cc', |
| 2654 ], |
| 2652 }], | 2655 }], |
| 2653 ['enable_themes == 1', { | 2656 ['enable_themes == 1', { |
| 2654 'sources': [ '<@(chrome_unit_tests_themes_sources)' ], | 2657 'sources': [ '<@(chrome_unit_tests_themes_sources)' ], |
| 2655 }], | 2658 }], |
| 2656 ['toolkit_views==1', { | 2659 ['toolkit_views==1', { |
| 2657 'dependencies': [ | 2660 'dependencies': [ |
| 2658 '../components/components.gyp:web_modal_test_support', | 2661 '../components/components.gyp:web_modal_test_support', |
| 2659 '../ui/views/views.gyp:views', | 2662 '../ui/views/views.gyp:views', |
| 2660 '../ui/views/views.gyp:views_test_support', | 2663 '../ui/views/views.gyp:views_test_support', |
| 2661 ], | 2664 ], |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2927 'dependencies': [ | 2930 'dependencies': [ |
| 2928 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', | 2931 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 2929 ], | 2932 ], |
| 2930 }], | 2933 }], |
| 2931 ], | 2934 ], |
| 2932 }, | 2935 }, |
| 2933 ], | 2936 ], |
| 2934 }], | 2937 }], |
| 2935 ], # 'conditions' | 2938 ], # 'conditions' |
| 2936 } | 2939 } |
| OLD | NEW |