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

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

Issue 1329583002: Add missing Android GN build dep on md5sum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: data_deps Created 5 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 | « 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 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 ] 779 ]
780 } 780 }
781 } 781 }
782 782
783 package_target = "${target_name}__package" 783 package_target = "${target_name}__package"
784 package_apk(package_target) { 784 package_apk(package_target) {
785 deps = [] 785 deps = []
786 forward_variables_from(invoker, [ "deps" ]) 786 forward_variables_from(invoker, [ "deps" ])
787 deps += [ ":${_package_resources_target_name}" ] 787 deps += [ ":${_package_resources_target_name}" ]
788 788
789 data_deps = [ "//tools/android/md5sum" ] # Used when deploying APKs
790
789 if (defined(_dex_path)) { 791 if (defined(_dex_path)) {
790 dex_path = _dex_path 792 dex_path = _dex_path
791 } 793 }
792 native_libs_dir = _native_libs_dir 794 native_libs_dir = _native_libs_dir
793 output_apk_path = _packaged_apk_path 795 output_apk_path = _packaged_apk_path
794 resource_packaged_apk_path = _resource_packaged_apk_path 796 resource_packaged_apk_path = _resource_packaged_apk_path
795 } 797 }
796 798
797 _incremental_package_target = "${target_name}_incremental__package" 799 _incremental_package_target = "${target_name}_incremental__package"
798 package_apk(_incremental_package_target) { 800 package_apk(_incremental_package_target) {
(...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 ] 1619 ]
1618 args = [ 1620 args = [
1619 "--depfile", 1621 "--depfile",
1620 rebase_path(depfile, root_build_dir), 1622 rebase_path(depfile, root_build_dir),
1621 "--script-output-path", 1623 "--script-output-path",
1622 rebase_path(generated_script, root_build_dir), 1624 rebase_path(generated_script, root_build_dir),
1623 ] 1625 ]
1624 args += test_runner_args 1626 args += test_runner_args
1625 } 1627 }
1626 } 1628 }
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