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 1834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1845 }, | 1845 }, |
1846 'includes': [ '../build/jni_generator.gypi' ], | 1846 'includes': [ '../build/jni_generator.gypi' ], |
1847 }, | 1847 }, |
1848 { | 1848 { |
1849 # GN: //content/public/test/android:content_java_test_support | 1849 # GN: //content/public/test/android:content_java_test_support |
1850 'target_name': 'content_java_test_support', | 1850 'target_name': 'content_java_test_support', |
1851 'type': 'none', | 1851 'type': 'none', |
1852 'dependencies': [ | 1852 'dependencies': [ |
1853 '../base/base.gyp:base', | 1853 '../base/base.gyp:base', |
1854 '../base/base.gyp:base_java_test_support', | 1854 '../base/base.gyp:base_java_test_support', |
1855 'content.gyp:content_common', | |
qsr
2014/12/04 14:41:36
This seems fine with me, as content_common is not
cjhopman
2014/12/04 19:15:11
Yeah this is fine.
| |
1856 'content.gyp:content_java', | 1855 'content.gyp:content_java', |
1857 ], | 1856 ], |
1858 'variables': { | 1857 'variables': { |
1859 'java_in_dir': '../content/public/test/android/javatests', | 1858 'java_in_dir': '../content/public/test/android/javatests', |
1860 }, | 1859 }, |
1861 'includes': [ '../build/java.gypi' ], | 1860 'includes': [ '../build/java.gypi' ], |
1862 }, | 1861 }, |
1863 { | 1862 { |
1864 # GN: //content/shell/android:content_shell_test_apk | 1863 # GN: //content/shell/android:content_shell_test_apk |
1865 # and //content/public/android:content_javatests | 1864 # and //content/public/android:content_javatests |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2030 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], | 2029 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], |
2031 }, | 2030 }, |
2032 ], | 2031 ], |
2033 }], | 2032 }], |
2034 ], | 2033 ], |
2035 }, | 2034 }, |
2036 ], | 2035 ], |
2037 }], | 2036 }], |
2038 ], | 2037 ], |
2039 } | 2038 } |
OLD | NEW |