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

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

Issue 2500113003: Fix inputs for main_dex_list action. (Closed)
Patch Set: Created 4 years, 1 month 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 | « no previous file | no next file » | 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 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build_overrides/build.gni") 7 import("//build_overrides/build.gni")
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/sanitizers/sanitizers.gni") 9 import("//build/config/sanitizers/sanitizers.gni")
10 10
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 "inputs", 918 "inputs",
919 "sources", 919 "sources",
920 "testonly", 920 "testonly",
921 ]) 921 ])
922 922
923 script = "//build/android/gyp/main_dex_list.py" 923 script = "//build/android/gyp/main_dex_list.py"
924 depfile = "$target_gen_dir/$target_name.d" 924 depfile = "$target_gen_dir/$target_name.d"
925 925
926 main_dex_rules = "//build/android/main_dex_classes.flags" 926 main_dex_rules = "//build/android/main_dex_classes.flags"
927 927
928 inputs += [ main_dex_rules ]
agrieve 2016/11/14 21:24:05 should also add a: if (!defined(inputs)) { input
929
928 outputs = [ 930 outputs = [
929 _main_dex_list_path, 931 _main_dex_list_path,
930 ] 932 ]
931 933
932 args = [ 934 args = [
933 "--depfile", 935 "--depfile",
934 rebase_path(depfile, root_build_dir), 936 rebase_path(depfile, root_build_dir),
935 "--android-sdk-tools", 937 "--android-sdk-tools",
936 rebased_android_sdk_build_tools, 938 rebased_android_sdk_build_tools,
937 "--main-dex-list-path", 939 "--main-dex-list-path",
(...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
2703 rebase_path(root_build_dir, root_build_dir), 2705 rebase_path(root_build_dir, root_build_dir),
2704 "--packed-libraries-dir", 2706 "--packed-libraries-dir",
2705 rebase_path(_packed_libraries_dir, root_build_dir), 2707 rebase_path(_packed_libraries_dir, root_build_dir),
2706 "--libraries=${invoker.libraries_filearg}", 2708 "--libraries=${invoker.libraries_filearg}",
2707 "--filelistjson", 2709 "--filelistjson",
2708 rebase_path(invoker.file_list_json, root_build_dir), 2710 rebase_path(invoker.file_list_json, root_build_dir),
2709 ] 2711 ]
2710 } 2712 }
2711 } 2713 }
2712 } 2714 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698