Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1677)

Side by Side Diff: build/config/android/internal_rules.gni

Issue 2315993003: Reland of GN(Android): Stop specifying depfile under outputs (Closed)
Patch Set: Create depfile parent directory when it doesn't exist Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/android/gyp/util/build_utils.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_overrides/build.gni") 5 import("//build_overrides/build.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/sanitizers/sanitizers.gni") 7 import("//build/config/sanitizers/sanitizers.gni")
8 8
9 assert(is_android) 9 assert(is_android)
10 10
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 _deps_configs += [ "$_dep_gen_dir/$_dep_name.build_config" ] 144 _deps_configs += [ "$_dep_gen_dir/$_dep_name.build_config" ]
145 } 145 }
146 } 146 }
147 sources = [] 147 sources = []
148 } 148 }
149 set_sources_assignment_filter([]) 149 set_sources_assignment_filter([])
150 } 150 }
151 _rebased_deps_configs = rebase_path(_deps_configs, root_build_dir) 151 _rebased_deps_configs = rebase_path(_deps_configs, root_build_dir)
152 152
153 outputs = [ 153 outputs = [
154 depfile,
155 build_config, 154 build_config,
156 ] 155 ]
157 156
158 args = [ 157 args = [
159 "--type", 158 "--type",
160 type, 159 type,
161 "--depfile", 160 "--depfile",
162 rebase_path(depfile, root_build_dir), 161 rebase_path(depfile, root_build_dir),
163 "--deps-configs=$_rebased_deps_configs", 162 "--deps-configs=$_rebased_deps_configs",
164 "--build-config", 163 "--build-config",
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 "deps", 378 "deps",
380 "inputs", 379 "inputs",
381 "sources", 380 "sources",
382 "testonly", 381 "testonly",
383 "visibility", 382 "visibility",
384 ]) 383 ])
385 if (!defined(sources)) { 384 if (!defined(sources)) {
386 sources = [] 385 sources = []
387 } 386 }
388 script = "//build/android/gyp/copy_ex.py" 387 script = "//build/android/gyp/copy_ex.py"
388 depfile = "$target_gen_dir/$target_name.d"
389 389
390 depfile = "$target_gen_dir/$target_name.d" 390 _stamp_file = "$target_gen_dir/$target_name.stamp"
391 outputs = [ 391 outputs = [
392 depfile, 392 _stamp_file,
393 ] 393 ]
394 394
395 args = [ 395 args = [
396 "--depfile", 396 "--depfile",
397 rebase_path(depfile, root_build_dir), 397 rebase_path(depfile, root_build_dir),
398 "--stamp",
399 rebase_path(_stamp_file, root_build_dir),
398 "--dest", 400 "--dest",
399 rebase_path(invoker.dest, root_build_dir), 401 rebase_path(invoker.dest, root_build_dir),
400 ] 402 ]
401 rebased_sources = rebase_path(sources, root_build_dir) 403 rebased_sources = rebase_path(sources, root_build_dir)
402 args += [ "--files=$rebased_sources" ] 404 args += [ "--files=$rebased_sources" ]
403 405
404 if (defined(invoker.clear_dir) && invoker.clear_dir) { 406 if (defined(invoker.clear_dir) && invoker.clear_dir) {
405 args += [ "--clear" ] 407 args += [ "--clear" ]
406 } 408 }
407 409
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 ] 605 ]
604 } 606 }
605 test_runner_args += [ "--fast-local-dev" ] 607 test_runner_args += [ "--fast-local-dev" ]
606 } 608 }
607 if (is_asan) { 609 if (is_asan) {
608 test_runner_args += [ "--tool=asan" ] 610 test_runner_args += [ "--tool=asan" ]
609 } 611 }
610 612
611 generated_script = "$root_build_dir/bin/run_${_test_name}" 613 generated_script = "$root_build_dir/bin/run_${_test_name}"
612 outputs = [ 614 outputs = [
613 depfile,
614 generated_script, 615 generated_script,
615 ] 616 ]
616 data += [ generated_script ] 617 data += [ generated_script ]
617 618
618 args = [ 619 args = [
619 "--depfile", 620 "--depfile",
620 rebase_path(depfile, root_build_dir), 621 rebase_path(depfile, root_build_dir),
621 "--script-output-path", 622 "--script-output-path",
622 rebase_path(generated_script, root_build_dir), 623 rebase_path(generated_script, root_build_dir),
623 ] 624 ]
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 671
671 script = "//build/android/gyp/lint.py" 672 script = "//build/android/gyp/lint.py"
672 depfile = "$target_gen_dir/$target_name.d" 673 depfile = "$target_gen_dir/$target_name.d"
673 inputs = [ 674 inputs = [
674 _platform_xml_path, 675 _platform_xml_path,
675 _suppressions_file, 676 _suppressions_file,
676 invoker.android_manifest, 677 invoker.android_manifest,
677 ] 678 ]
678 679
679 outputs = [ 680 outputs = [
680 depfile,
681 _config_path, 681 _config_path,
682 _result_path, 682 _result_path,
683 ] 683 ]
684 684
685 args = [ 685 args = [
686 "--lint-path=$_rebased_lint_android_sdk_root/tools/lint", 686 "--lint-path=$_rebased_lint_android_sdk_root/tools/lint",
687 "--cache-dir", 687 "--cache-dir",
688 rebase_path(_cache_dir, root_build_dir), 688 rebase_path(_cache_dir, root_build_dir),
689 "--platform-xml-path", 689 "--platform-xml-path",
690 rebase_path(_platform_xml_path, root_build_dir), 690 rebase_path(_platform_xml_path, root_build_dir),
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 rebase_path(invoker.alternative_android_sdk_jar) 762 rebase_path(invoker.alternative_android_sdk_jar)
763 } else { 763 } else {
764 inputs += [ android_sdk_jar ] 764 inputs += [ android_sdk_jar ]
765 _rebased_android_sdk_jar = rebased_android_sdk_jar 765 _rebased_android_sdk_jar = rebased_android_sdk_jar
766 } 766 }
767 if (defined(invoker.inputs)) { 767 if (defined(invoker.inputs)) {
768 inputs += invoker.inputs 768 inputs += invoker.inputs
769 } 769 }
770 depfile = "${target_gen_dir}/${target_name}.d" 770 depfile = "${target_gen_dir}/${target_name}.d"
771 outputs = [ 771 outputs = [
772 depfile,
773 _output_jar_path, 772 _output_jar_path,
774 "$_output_jar_path.dump", 773 "$_output_jar_path.dump",
775 "$_output_jar_path.seeds", 774 "$_output_jar_path.seeds",
776 "$_output_jar_path.mapping", 775 "$_output_jar_path.mapping",
777 "$_output_jar_path.usage", 776 "$_output_jar_path.usage",
778 ] 777 ]
779 args = [ 778 args = [
780 "--depfile", 779 "--depfile",
781 rebase_path(depfile, root_build_dir), 780 rebase_path(depfile, root_build_dir),
782 "--proguard-path", 781 "--proguard-path",
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 _rebased_build_config = rebase_path(invoker.build_config, root_build_dir) 814 _rebased_build_config = rebase_path(invoker.build_config, root_build_dir)
816 815
817 inputs = [ 816 inputs = [
818 "//build/android/pylib/utils/findbugs.py", 817 "//build/android/pylib/utils/findbugs.py",
819 _exclusions_file, 818 _exclusions_file,
820 invoker.jar_path, 819 invoker.jar_path,
821 invoker.build_config, 820 invoker.build_config,
822 ] 821 ]
823 822
824 outputs = [ 823 outputs = [
825 depfile,
826 _result_path, 824 _result_path,
827 ] 825 ]
828 826
829 args = [ 827 args = [
830 "--depfile", 828 "--depfile",
831 rebase_path(depfile, root_build_dir), 829 rebase_path(depfile, root_build_dir),
832 "--exclude", 830 "--exclude",
833 rebase_path(_exclusions_file, root_build_dir), 831 rebase_path(_exclusions_file, root_build_dir),
834 "--auxclasspath-gyp", 832 "--auxclasspath-gyp",
835 "@FileArg($_rebased_build_config:javac:classpath)", 833 "@FileArg($_rebased_build_config:javac:classpath)",
(...skipping 27 matching lines...) Expand all
863 _script_name = invoker.script_name 861 _script_name = invoker.script_name
864 862
865 action(target_name) { 863 action(target_name) {
866 script = "//build/android/gyp/create_java_binary_script.py" 864 script = "//build/android/gyp/create_java_binary_script.py"
867 depfile = "$target_gen_dir/$_script_name.d" 865 depfile = "$target_gen_dir/$_script_name.d"
868 java_script = "$root_build_dir/bin/$_script_name" 866 java_script = "$root_build_dir/bin/$_script_name"
869 inputs = [ 867 inputs = [
870 _build_config, 868 _build_config,
871 ] 869 ]
872 outputs = [ 870 outputs = [
873 depfile,
874 java_script, 871 java_script,
875 ] 872 ]
876 forward_variables_from(invoker, [ "deps" ]) 873 forward_variables_from(invoker, [ "deps" ])
877 _rebased_build_config = rebase_path(_build_config, root_build_dir) 874 _rebased_build_config = rebase_path(_build_config, root_build_dir)
878 args = [ 875 args = [
879 "--depfile", 876 "--depfile",
880 rebase_path(depfile, root_build_dir), 877 rebase_path(depfile, root_build_dir),
881 "--output", 878 "--output",
882 rebase_path(java_script, root_build_dir), 879 rebase_path(java_script, root_build_dir),
883 "--classpath=@FileArg($_rebased_build_config:deps_info:java:full_classpa th)", 880 "--classpath=@FileArg($_rebased_build_config:deps_info:java:full_classpa th)",
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 "sources", 921 "sources",
925 "testonly", 922 "testonly",
926 ]) 923 ])
927 924
928 script = "//build/android/gyp/main_dex_list.py" 925 script = "//build/android/gyp/main_dex_list.py"
929 depfile = "$target_gen_dir/$target_name.d" 926 depfile = "$target_gen_dir/$target_name.d"
930 927
931 main_dex_rules = "//build/android/main_dex_classes.flags" 928 main_dex_rules = "//build/android/main_dex_classes.flags"
932 929
933 outputs = [ 930 outputs = [
934 depfile,
935 _main_dex_list_path, 931 _main_dex_list_path,
936 ] 932 ]
937 933
938 args = [ 934 args = [
939 "--depfile", 935 "--depfile",
940 rebase_path(depfile, root_build_dir), 936 rebase_path(depfile, root_build_dir),
941 "--android-sdk-tools", 937 "--android-sdk-tools",
942 rebased_android_sdk_build_tools, 938 rebased_android_sdk_build_tools,
943 "--main-dex-list-path", 939 "--main-dex-list-path",
944 rebase_path(_main_dex_list_path, root_build_dir), 940 rebase_path(_main_dex_list_path, root_build_dir),
(...skipping 16 matching lines...) Expand all
961 forward_variables_from(invoker, 957 forward_variables_from(invoker,
962 [ 958 [
963 "deps", 959 "deps",
964 "inputs", 960 "inputs",
965 "sources", 961 "sources",
966 "testonly", 962 "testonly",
967 ]) 963 ])
968 script = "//build/android/gyp/dex.py" 964 script = "//build/android/gyp/dex.py"
969 depfile = "$target_gen_dir/$target_name.d" 965 depfile = "$target_gen_dir/$target_name.d"
970 outputs = [ 966 outputs = [
971 depfile,
972 invoker.output, 967 invoker.output,
973 ] 968 ]
974 969
975 rebased_output = rebase_path(invoker.output, root_build_dir) 970 rebased_output = rebase_path(invoker.output, root_build_dir)
976 971
977 args = [ 972 args = [
978 "--depfile", 973 "--depfile",
979 rebase_path(depfile, root_build_dir), 974 rebase_path(depfile, root_build_dir),
980 "--android-sdk-tools", 975 "--android-sdk-tools",
981 rebased_android_sdk_build_tools, 976 rebased_android_sdk_build_tools,
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 _source_dirs_listing_file = "$target_out_dir/${target_name}_sources.txt" 1148 _source_dirs_listing_file = "$target_out_dir/${target_name}_sources.txt"
1154 _emma_jar = "${android_sdk_root}/tools/lib/emma.jar" 1149 _emma_jar = "${android_sdk_root}/tools/lib/emma.jar"
1155 1150
1156 script = "//build/android/gyp/emma_instr.py" 1151 script = "//build/android/gyp/emma_instr.py"
1157 depfile = "${target_gen_dir}/${target_name}.d" 1152 depfile = "${target_gen_dir}/${target_name}.d"
1158 inputs = invoker.java_files + [ 1153 inputs = invoker.java_files + [
1159 _emma_jar, 1154 _emma_jar,
1160 invoker.input_jar_path, 1155 invoker.input_jar_path,
1161 ] 1156 ]
1162 outputs = [ 1157 outputs = [
1163 depfile,
1164 _coverage_file, 1158 _coverage_file,
1165 _source_dirs_listing_file, 1159 _source_dirs_listing_file,
1166 invoker.output_jar_path, 1160 invoker.output_jar_path,
1167 ] 1161 ]
1168 args = [ 1162 args = [
1169 "instrument_jar", 1163 "instrument_jar",
1170 "--input-path", 1164 "--input-path",
1171 rebase_path(invoker.input_jar_path, root_build_dir), 1165 rebase_path(invoker.input_jar_path, root_build_dir),
1172 "--output-path", 1166 "--output-path",
1173 rebase_path(invoker.output_jar_path, root_build_dir), 1167 rebase_path(invoker.output_jar_path, root_build_dir),
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 data_deps = [ 1222 data_deps = [
1229 "//tools/android/md5sum", 1223 "//tools/android/md5sum",
1230 ] # Used when deploying APKs 1224 ] # Used when deploying APKs
1231 1225
1232 inputs = invoker.native_libs + [ invoker.resource_packaged_apk_path ] 1226 inputs = invoker.native_libs + [ invoker.resource_packaged_apk_path ]
1233 if (defined(invoker.dex_path)) { 1227 if (defined(invoker.dex_path)) {
1234 inputs += [ invoker.dex_path ] 1228 inputs += [ invoker.dex_path ]
1235 } 1229 }
1236 1230
1237 outputs = [ 1231 outputs = [
1238 depfile,
1239 invoker.output_apk_path, 1232 invoker.output_apk_path,
1240 ] 1233 ]
1241 1234
1242 _rebased_resource_packaged_apk_path = 1235 _rebased_resource_packaged_apk_path =
1243 rebase_path(invoker.resource_packaged_apk_path, root_build_dir) 1236 rebase_path(invoker.resource_packaged_apk_path, root_build_dir)
1244 _rebased_packaged_apk_path = 1237 _rebased_packaged_apk_path =
1245 rebase_path(invoker.output_apk_path, root_build_dir) 1238 rebase_path(invoker.output_apk_path, root_build_dir)
1246 args = [ 1239 args = [
1247 "--depfile", 1240 "--depfile",
1248 rebase_path(depfile, root_build_dir), 1241 rebase_path(depfile, root_build_dir),
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 "testonly", 1318 "testonly",
1326 ]) 1319 ])
1327 1320
1328 sources = [ 1321 sources = [
1329 invoker.input_apk_path, 1322 invoker.input_apk_path,
1330 ] 1323 ]
1331 inputs = [ 1324 inputs = [
1332 invoker.keystore_path, 1325 invoker.keystore_path,
1333 ] 1326 ]
1334 outputs = [ 1327 outputs = [
1335 depfile,
1336 invoker.output_apk_path, 1328 invoker.output_apk_path,
1337 ] 1329 ]
1338 data = [ 1330 data = [
1339 invoker.output_apk_path, 1331 invoker.output_apk_path,
1340 ] 1332 ]
1341 1333
1342 args = [ 1334 args = [
1343 "--depfile", 1335 "--depfile",
1344 rebase_path(depfile, root_build_dir), 1336 rebase_path(depfile, root_build_dir),
1345 "--zipalign-path", 1337 "--zipalign-path",
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
1462 1454
1463 script = "//build/android/gyp/package_resources.py" 1455 script = "//build/android/gyp/package_resources.py"
1464 depfile = "${target_gen_dir}/${target_name}.d" 1456 depfile = "${target_gen_dir}/${target_name}.d"
1465 inputs = [ 1457 inputs = [
1466 invoker.android_manifest, 1458 invoker.android_manifest,
1467 ] 1459 ]
1468 if (defined(_resources_zip)) { 1460 if (defined(_resources_zip)) {
1469 inputs += [ _resources_zip ] 1461 inputs += [ _resources_zip ]
1470 } 1462 }
1471 outputs = [ 1463 outputs = [
1472 depfile,
1473 invoker.resource_packaged_apk_path, 1464 invoker.resource_packaged_apk_path,
1474 ] 1465 ]
1475 1466
1476 if (defined(invoker.android_aapt_path)) { 1467 if (defined(invoker.android_aapt_path)) {
1477 _android_aapt_path = invoker.android_aapt_path 1468 _android_aapt_path = invoker.android_aapt_path
1478 } else { 1469 } else {
1479 _android_aapt_path = android_default_aapt_path 1470 _android_aapt_path = android_default_aapt_path
1480 } 1471 }
1481 1472
1482 if (defined(invoker.alternative_android_sdk_jar)) { 1473 if (defined(invoker.alternative_android_sdk_jar)) {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
1557 "target_gen_dir") + "/AndroidManifest.xml" 1548 "target_gen_dir") + "/AndroidManifest.xml"
1558 action(_generate_incremental_manifest_target_name) { 1549 action(_generate_incremental_manifest_target_name) {
1559 deps = _incremental_deps 1550 deps = _incremental_deps
1560 script = 1551 script =
1561 "//build/android/incremental_install/generate_android_manifest.py" 1552 "//build/android/incremental_install/generate_android_manifest.py"
1562 depfile = "${target_gen_dir}/${target_name}.d" 1553 depfile = "${target_gen_dir}/${target_name}.d"
1563 inputs = [ 1554 inputs = [
1564 _android_manifest, 1555 _android_manifest,
1565 ] 1556 ]
1566 outputs = [ 1557 outputs = [
1567 depfile,
1568 _incremental_android_manifest, 1558 _incremental_android_manifest,
1569 ] 1559 ]
1570 1560
1571 _rebased_src_manifest = rebase_path(_android_manifest, root_build_dir) 1561 _rebased_src_manifest = rebase_path(_android_manifest, root_build_dir)
1572 _rebased_incremental_manifest = 1562 _rebased_incremental_manifest =
1573 rebase_path(_incremental_android_manifest, root_build_dir) 1563 rebase_path(_incremental_android_manifest, root_build_dir)
1574 _rebased_depfile = rebase_path(depfile, root_build_dir) 1564 _rebased_depfile = rebase_path(depfile, root_build_dir)
1575 args = [ 1565 args = [
1576 "--src-manifest=$_rebased_src_manifest", 1566 "--src-manifest=$_rebased_src_manifest",
1577 "--out-manifest=$_rebased_incremental_manifest", 1567 "--out-manifest=$_rebased_incremental_manifest",
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1992 1982
1993 action(_javac_target_name) { 1983 action(_javac_target_name) {
1994 script = "//build/android/gyp/javac.py" 1984 script = "//build/android/gyp/javac.py"
1995 depfile = "$target_gen_dir/$target_name.d" 1985 depfile = "$target_gen_dir/$target_name.d"
1996 deps = _srcjar_deps 1986 deps = _srcjar_deps
1997 if (defined(invoker.deps)) { 1987 if (defined(invoker.deps)) {
1998 deps += invoker.deps 1988 deps += invoker.deps
1999 } 1989 }
2000 1990
2001 outputs = [ 1991 outputs = [
2002 depfile,
2003 _javac_jar_path, 1992 _javac_jar_path,
2004 _javac_jar_path + ".md5.stamp", 1993 _javac_jar_path + ".md5.stamp",
2005 ] 1994 ]
2006 sources = invoker.java_files + _java_srcjars 1995 sources = invoker.java_files + _java_srcjars
2007 inputs = [ 1996 inputs = [
2008 _build_config, 1997 _build_config,
2009 ] 1998 ]
2010 if (invoker.java_files != []) { 1999 if (invoker.java_files != []) {
2011 inputs += [ invoker.java_sources_file ] 2000 inputs += [ invoker.java_sources_file ]
2012 } 2001 }
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2436 action(target_name) { 2425 action(target_name) {
2437 forward_variables_from(invoker, 2426 forward_variables_from(invoker,
2438 [ 2427 [
2439 "deps", 2428 "deps",
2440 "visibility", 2429 "visibility",
2441 ]) 2430 ])
2442 script = "//build/android/gyp/process_resources.py" 2431 script = "//build/android/gyp/process_resources.py"
2443 2432
2444 depfile = "$target_gen_dir/$target_name.d" 2433 depfile = "$target_gen_dir/$target_name.d"
2445 outputs = [ 2434 outputs = [
2446 depfile,
2447 zip_path, 2435 zip_path,
2448 srcjar_path, 2436 srcjar_path,
2449 r_text_path, 2437 r_text_path,
2450 ] 2438 ]
2451 2439
2452 _all_resource_dirs = [] 2440 _all_resource_dirs = []
2453 sources = [] 2441 sources = []
2454 2442
2455 if (defined(invoker.resource_dirs)) { 2443 if (defined(invoker.resource_dirs)) {
2456 _all_resource_dirs += invoker.resource_dirs 2444 _all_resource_dirs += invoker.resource_dirs
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
2638 invoker.has_code, 2626 invoker.has_code,
2639 ] 2627 ]
2640 } 2628 }
2641 args += [ 2629 args += [
2642 "--depfile", 2630 "--depfile",
2643 rebase_path(depfile, root_build_dir), 2631 rebase_path(depfile, root_build_dir),
2644 ] 2632 ]
2645 2633
2646 script = "//build/android/gyp/generate_split_manifest.py" 2634 script = "//build/android/gyp/generate_split_manifest.py"
2647 outputs = [ 2635 outputs = [
2648 depfile,
2649 invoker.out_manifest, 2636 invoker.out_manifest,
2650 ] 2637 ]
2651 inputs = [ 2638 inputs = [
2652 invoker.main_manifest, 2639 invoker.main_manifest,
2653 ] 2640 ]
2654 } 2641 }
2655 } 2642 }
2656 } 2643 }
OLDNEW
« no previous file with comments | « build/android/gyp/util/build_utils.py ('k') | build/config/android/rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698