| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 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 'layouttest_support_content_sources': [ | 7 'layouttest_support_content_sources': [ |
| 8 'public/test/layouttest_support.h', | 8 'public/test/layouttest_support.h', |
| 9 'public/test/nested_message_pump_android.cc', | 9 'public/test/nested_message_pump_android.cc', |
| 10 'public/test/nested_message_pump_android.h', | 10 'public/test/nested_message_pump_android.h', |
| (...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 'dependencies': [ | 980 'dependencies': [ |
| 981 'content_unittests', | 981 'content_unittests', |
| 982 ], | 982 ], |
| 983 'includes': [ | 983 'includes': [ |
| 984 '../build/isolate.gypi', | 984 '../build/isolate.gypi', |
| 985 'content_unittests.isolate', | 985 'content_unittests.isolate', |
| 986 ], | 986 ], |
| 987 'sources': [ | 987 'sources': [ |
| 988 'content_unittests.isolate', | 988 'content_unittests.isolate', |
| 989 ], | 989 ], |
| 990 'conditions': [ |
| 991 ['OS=="linux" and use_ozone==0', { |
| 992 'dependencies': [ |
| 993 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', |
| 994 ], |
| 995 }], |
| 996 ], |
| 990 }, | 997 }, |
| 991 ], | 998 ], |
| 992 'conditions': [ | 999 'conditions': [ |
| 993 ['archive_gpu_tests==1', { | 1000 ['archive_gpu_tests==1', { |
| 994 'targets': [ | 1001 'targets': [ |
| 995 { | 1002 { |
| 996 'target_name': 'content_gl_tests_run', | 1003 'target_name': 'content_gl_tests_run', |
| 997 'type': 'none', | 1004 'type': 'none', |
| 998 'dependencies': [ | 1005 'dependencies': [ |
| 999 'content_shell_and_tests.gyp:content_gl_tests', | 1006 'content_shell_and_tests.gyp:content_gl_tests', |
| (...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1917 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 1924 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
| 1918 }, | 1925 }, |
| 1919 ], | 1926 ], |
| 1920 }], | 1927 }], |
| 1921 ], | 1928 ], |
| 1922 }, | 1929 }, |
| 1923 ], | 1930 ], |
| 1924 }], | 1931 }], |
| 1925 ], | 1932 ], |
| 1926 } | 1933 } |
| OLD | NEW |