Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") | 
| 6 import("//build/config/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") | 
| 7 import("//build/config/zip.gni") | 7 import("//build/config/zip.gni") | 
| 8 import("//third_party/ijar/ijar.gni") | 8 import("//third_party/ijar/ijar.gni") | 
| 9 | 9 | 
| 10 assert(is_android) | 10 assert(is_android) | 
| (...skipping 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1783 ]) | 1783 ]) | 
| 1784 jar_path = _jar_path | 1784 jar_path = _jar_path | 
| 1785 build_config = _build_config | 1785 build_config = _build_config | 
| 1786 java_files = _java_files | 1786 java_files = _java_files | 
| 1787 srcjar_deps = _srcjar_deps | 1787 srcjar_deps = _srcjar_deps | 
| 1788 srcjars = _srcjars | 1788 srcjars = _srcjars | 
| 1789 chromium_code = _chromium_code | 1789 chromium_code = _chromium_code | 
| 1790 supports_android = _supports_android | 1790 supports_android = _supports_android | 
| 1791 emma_instrument = _emma_instrument | 1791 emma_instrument = _emma_instrument | 
| 1792 deps = build_config_deps | 1792 deps = build_config_deps | 
| 1793 if (defined(invoker.java_deps)) { | |
| 
 
agrieve
2016/05/19 00:42:50
A codesearch for java_deps shows no usages. I thin
 
ynovikov
2016/05/20 02:38:10
I've used java_deps in testing/android/native_test
 
agrieve
2016/05/20 14:13:04
Looks like this was just a bug in the GN templates
 
ynovikov
2016/05/26 03:16:15
Done.
 
 | |
| 1794 deps += invoker.java_deps | |
| 1795 } | |
| 1793 } | 1796 } | 
| 1794 | 1797 | 
| 1795 if (defined(invoker.main_class)) { | 1798 if (defined(invoker.main_class)) { | 
| 1796 # Targets might use the generated script while building, so make it a dep | 1799 # Targets might use the generated script while building, so make it a dep | 
| 1797 # rather than a data_dep. | 1800 # rather than a data_dep. | 
| 1798 _final_deps += [ ":${_template_name}__java_binary_script" ] | 1801 _final_deps += [ ":${_template_name}__java_binary_script" ] | 
| 1799 java_binary_script("${_template_name}__java_binary_script") { | 1802 java_binary_script("${_template_name}__java_binary_script") { | 
| 1800 forward_variables_from(invoker, | 1803 forward_variables_from(invoker, | 
| 1801 [ | 1804 [ | 
| 1802 "bootclasspath", | 1805 "bootclasspath", | 
| (...skipping 16 matching lines...) Expand all Loading... | |
| 1819 _has_lint_target = true | 1822 _has_lint_target = true | 
| 1820 android_lint("${_template_name}__lint") { | 1823 android_lint("${_template_name}__lint") { | 
| 1821 android_manifest = _android_manifest | 1824 android_manifest = _android_manifest | 
| 1822 build_config = _build_config | 1825 build_config = _build_config | 
| 1823 jar_path = _jar_path | 1826 jar_path = _jar_path | 
| 1824 java_files = _java_files | 1827 java_files = _java_files | 
| 1825 deps = build_config_deps + [ ":$_compile_java_target" ] | 1828 deps = build_config_deps + [ ":$_compile_java_target" ] | 
| 1826 if (defined(invoker.deps)) { | 1829 if (defined(invoker.deps)) { | 
| 1827 deps += invoker.deps | 1830 deps += invoker.deps | 
| 1828 } | 1831 } | 
| 1832 if (defined(invoker.java_deps)) { | |
| 1833 deps += invoker.java_deps | |
| 1834 } | |
| 1829 } | 1835 } | 
| 1830 | 1836 | 
| 1831 if (_run_findbugs) { | 1837 if (_run_findbugs) { | 
| 1832 findbugs("${_template_name}__findbugs") { | 1838 findbugs("${_template_name}__findbugs") { | 
| 1833 build_config = _build_config | 1839 build_config = _build_config | 
| 1834 jar_path = _jar_path | 1840 jar_path = _jar_path | 
| 1835 deps = build_config_deps + [ ":$_compile_java_target" ] | 1841 deps = build_config_deps + [ ":$_compile_java_target" ] | 
| 1836 } | 1842 } | 
| 1837 } | 1843 } | 
| 1838 | 1844 | 
| (...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2312 | 2318 | 
| 2313 args = [ | 2319 args = [ | 
| 2314 "--depfile", | 2320 "--depfile", | 
| 2315 rebase_path(depfile, root_build_dir), | 2321 rebase_path(depfile, root_build_dir), | 
| 2316 "--script-output-path", | 2322 "--script-output-path", | 
| 2317 rebase_path(generated_script, root_build_dir), | 2323 rebase_path(generated_script, root_build_dir), | 
| 2318 ] | 2324 ] | 
| 2319 args += test_runner_args | 2325 args += test_runner_args | 
| 2320 } | 2326 } | 
| 2321 } | 2327 } | 
| OLD | NEW |