Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//tools/grit/repack.gni") | 7 import("//tools/grit/repack.gni") |
| 8 | 8 |
| 9 # Arguments: | 9 # Arguments: |
| 10 # | 10 # |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 "${root_gen_dir}/content/app/strings/content_strings_${locale}.pak", | 55 "${root_gen_dir}/content/app/strings/content_strings_${locale}.pak", |
| 56 "${root_gen_dir}/ui/strings/ui_strings_${locale}.pak", | 56 "${root_gen_dir}/ui/strings/ui_strings_${locale}.pak", |
| 57 "${root_gen_dir}/ui/strings/app_locale_settings_${locale}.pak", | 57 "${root_gen_dir}/ui/strings/app_locale_settings_${locale}.pak", |
| 58 ] | 58 ] |
| 59 deps += [ | 59 deps += [ |
| 60 "//content/app/strings", | 60 "//content/app/strings", |
| 61 "//ui/strings:ui_strings", | 61 "//ui/strings:ui_strings", |
| 62 "//ui/strings:app_locale_settings", | 62 "//ui/strings:app_locale_settings", |
| 63 ] | 63 ] |
| 64 } | 64 } |
| 65 if (enable_autofill_dialog && !is_ios && !is_android) { | 65 if ((enable_autofill_dialog && !is_ios) || is_android) { |
|
Lei Zhang
2015/01/23 20:53:18
I think this should be just enable_autofill_dialog
Theresa
2015/01/23 21:44:06
You are correct. Done.
| |
| 66 sources += [ "${root_gen_dir}/third_party/libaddressinput/address_input_st rings_${locale}.pak" ] | 66 sources += [ "${root_gen_dir}/third_party/libaddressinput/address_input_st rings_${locale}.pak" ] |
| 67 deps += [ "//third_party/libaddressinput:strings" ] | 67 deps += [ "//third_party/libaddressinput:strings" ] |
| 68 } | 68 } |
| 69 if (enable_extensions) { | 69 if (enable_extensions) { |
| 70 sources += [ | 70 sources += [ |
| 71 "${root_gen_dir}/device/bluetooth/device_bluetooth_strings_${locale}.pak ", | 71 "${root_gen_dir}/device/bluetooth/device_bluetooth_strings_${locale}.pak ", |
| 72 | 72 |
| 73 # TODO(jamescook): When Android stops building extensions code move | 73 # TODO(jamescook): When Android stops building extensions code move |
| 74 # this to the OS != 'ios' and OS != 'android' section. | 74 # this to the OS != 'ios' and OS != 'android' section. |
| 75 "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak", | 75 "${root_gen_dir}/extensions/strings/extensions_strings_${locale}.pak", |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 153 } | 153 } |
| 154 | 154 |
| 155 # The group that external targets depend on which collects all deps. | 155 # The group that external targets depend on which collects all deps. |
| 156 group(group_target_name) { | 156 group(group_target_name) { |
| 157 if (defined(invoker.visibility)) { | 157 if (defined(invoker.visibility)) { |
| 158 visibility = invoker.visibility | 158 visibility = invoker.visibility |
| 159 } | 159 } |
| 160 deps = locale_targets | 160 deps = locale_targets |
| 161 } | 161 } |
| 162 } | 162 } |
| OLD | NEW |