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

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

Issue 1129773004: Fix a dependency issue w/ gn refs for android apks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mb_handle_labels
Patch Set: Created 5 years, 7 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 | « 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 6
7 assert(is_android) 7 assert(is_android)
8 8
9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir) 9 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir) 10 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 "--load-library-from-zip-file=1", 609 "--load-library-from-zip-file=1",
610 "--rezip-apk-jar-path", 610 "--rezip-apk-jar-path",
611 rebase_path(_rezip_jar_path, root_build_dir), 611 rebase_path(_rezip_jar_path, root_build_dir),
612 ] 612 ]
613 } 613 }
614 } 614 }
615 615
616 group(target_name) { 616 group(target_name) {
617 deps = [ 617 deps = [
618 ":${target_name}__finalize", 618 ":${target_name}__finalize",
619
620 # TODO: crbug.com/487897 - __finalize needs as input a file created
brettw 2015/05/14 16:42:51 I don't understand this comment. As we talked abou
Dirk Pranke 2015/05/14 17:27:06 Yeah, reading it in the morning, I don't think thi
621 # by __package_resources. We explicitly declare this as a dependency
622 # so that 'gn refs' knows about it (and hence 'mb analyze' will work
623 # correctly).
624 ":${target_name}__package_resources",
619 ] 625 ]
620 } 626 }
621 } 627 }
622 628
623 template("java_prebuilt_impl") { 629 template("java_prebuilt_impl") {
624 set_sources_assignment_filter([]) 630 set_sources_assignment_filter([])
625 if (defined(invoker.testonly)) { 631 if (defined(invoker.testonly)) {
626 testonly = invoker.testonly 632 testonly = invoker.testonly
627 } 633 }
628 _supports_android = 634 _supports_android =
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
1170 ] 1176 ]
1171 output = invoker.dex_path 1177 output = invoker.dex_path
1172 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files" 1178 dex_arg_key = "${rebased_build_config}:final_dex:dependency_dex_files"
1173 args = [ "--inputs=@FileArg($dex_arg_key)" ] 1179 args = [ "--inputs=@FileArg($dex_arg_key)" ]
1174 if (defined(invoker.excluded_jars)) { 1180 if (defined(invoker.excluded_jars)) {
1175 excluded_jars = rebase_path(invoker.excluded_jars, root_build_dir) 1181 excluded_jars = rebase_path(invoker.excluded_jars, root_build_dir)
1176 args += [ "--excluded-paths=${excluded_jars}" ] 1182 args += [ "--excluded-paths=${excluded_jars}" ]
1177 } 1183 }
1178 } 1184 }
1179 } 1185 }
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