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

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

Issue 2125083002: Fix missing build dep when alternative_locale_resource_dep is used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 import("//build/config/android/internal_rules.gni") 6 import("//build/config/android/internal_rules.gni")
7 import("//build/toolchain/toolchain.gni") 7 import("//build/toolchain/toolchain.gni")
8 8
9 assert(is_android) 9 assert(is_android)
10 10
(...skipping 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after
1685 zip_path = resources_zip_path 1685 zip_path = resources_zip_path
1686 all_resources_zip_path = _all_resources_zip_path 1686 all_resources_zip_path = _all_resources_zip_path
1687 generate_constant_ids = true 1687 generate_constant_ids = true
1688 proguard_file = _generated_proguard_config 1688 proguard_file = _generated_proguard_config
1689 1689
1690 build_config = _build_config 1690 build_config = _build_config
1691 deps = _android_manifest_deps + [ ":$build_config_target" ] 1691 deps = _android_manifest_deps + [ ":$build_config_target" ]
1692 if (defined(invoker.deps)) { 1692 if (defined(invoker.deps)) {
1693 deps += invoker.deps 1693 deps += invoker.deps
1694 } 1694 }
1695 if (defined(invoker.alternative_locale_resource_dep)) {
1696 deps += [ invoker.alternative_locale_resource_dep ]
1697 }
1695 } 1698 }
1696 _srcjar_deps += [ ":$process_resources_target" ] 1699 _srcjar_deps += [ ":$process_resources_target" ]
1697 1700
1698 if (_native_libs_deps != []) { 1701 if (_native_libs_deps != []) {
1699 _enable_chromium_linker_tests = false 1702 _enable_chromium_linker_tests = false
1700 if (defined(invoker.enable_chromium_linker_tests)) { 1703 if (defined(invoker.enable_chromium_linker_tests)) {
1701 _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests 1704 _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests
1702 } 1705 }
1703 _ordered_libraries_json = 1706 _ordered_libraries_json =
1704 "$target_gen_dir/$target_name.ordered_libararies.json" 1707 "$target_gen_dir/$target_name.ordered_libararies.json"
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
2559 android_library(target_name) { 2562 android_library(target_name) {
2560 chromium_code = false 2563 chromium_code = false
2561 java_files = [] 2564 java_files = []
2562 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2565 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2563 deps = [ 2566 deps = [
2564 "//third_party/android_protobuf:protobuf_nano_javalib", 2567 "//third_party/android_protobuf:protobuf_nano_javalib",
2565 ] 2568 ]
2566 } 2569 }
2567 } 2570 }
2568 } 2571 }
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