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/android/config.gni") | 5 import("//build/config/android/config.gni") |
6 import("//build/config/android/rules.gni") | 6 import("//build/config/android/rules.gni") |
7 import("//build/module_args/v8.gni") | 7 import("//build/module_args/v8.gni") |
8 import("//chrome/version.gni") | 8 import("//chrome/version.gni") |
9 import("//testing/test.gni") | 9 import("//testing/test.gni") |
10 import("//third_party/icu/config.gni") | 10 import("//third_party/icu/config.gni") |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
240 # GYP: //chrome/chrome_shell.gypi:libchromeshell | 240 # GYP: //chrome/chrome_shell.gypi:libchromeshell |
241 shared_library("chrome_shell") { | 241 shared_library("chrome_shell") { |
242 testonly = true | 242 testonly = true |
243 sources = [ | 243 sources = [ |
244 "shell/chrome_main_delegate_chrome_shell_android.cc", | 244 "shell/chrome_main_delegate_chrome_shell_android.cc", |
245 "shell/chrome_main_delegate_chrome_shell_android.h", | 245 "shell/chrome_main_delegate_chrome_shell_android.h", |
246 "shell/chrome_shell_entry_point.cc", | 246 "shell/chrome_shell_entry_point.cc", |
247 ] | 247 ] |
248 deps = [ | 248 deps = [ |
249 ":chrome_shell_base", | 249 ":chrome_shell_base", |
| 250 "//build/config/sanitizers:deps", |
250 ] | 251 ] |
251 } | 252 } |
252 | 253 |
253 # GYP: N/A | 254 # GYP: N/A |
254 android_resources("chrome_shell_resources") { | 255 android_resources("chrome_shell_resources") { |
255 deps = [ | 256 deps = [ |
256 ":chrome_java_resources", | 257 ":chrome_java_resources", |
257 ] | 258 ] |
258 testonly = true | 259 testonly = true |
259 resource_dirs = [ "shell/res" ] | 260 resource_dirs = [ "shell/res" ] |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
620 "java/res_template/xml/searchable.xml", | 621 "java/res_template/xml/searchable.xml", |
621 "java/res_template/xml/syncadapter.xml", | 622 "java/res_template/xml/syncadapter.xml", |
622 ] | 623 ] |
623 res_dir = "java/res_template" | 624 res_dir = "java/res_template" |
624 variables = jinja_variables | 625 variables = jinja_variables |
625 } | 626 } |
626 | 627 |
627 # GYP: //chrome/android/chrome_apk.gyp:libchrome_public | 628 # GYP: //chrome/android/chrome_apk.gyp:libchrome_public |
628 shared_library("chrome_public") { | 629 shared_library("chrome_public") { |
629 deps = [ | 630 deps = [ |
| 631 "//build/config/sanitizers:deps", |
630 "//chrome:chrome_android_core", | 632 "//chrome:chrome_android_core", |
631 ] | 633 ] |
632 gypi_values = exec_script( | 634 gypi_values = exec_script( |
633 "//build/gypi_to_gn.py", | 635 "//build/gypi_to_gn.py", |
634 [ | 636 [ |
635 rebase_path("chrome_apk.gyp"), | 637 rebase_path("chrome_apk.gyp"), |
636 "--replace=<(chrome_native_sources_dir)=../browser/android/", | 638 "--replace=<(chrome_native_sources_dir)=../browser/android/", |
637 ], | 639 ], |
638 "scope", | 640 "scope", |
639 [ "chrome_apk.gyp" ]) | 641 [ "chrome_apk.gyp" ]) |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
688 # TODO(GYP,cjhopman): Does this need version code/name? | 690 # TODO(GYP,cjhopman): Does this need version code/name? |
689 apk_name = "ChromePublicTest" | 691 apk_name = "ChromePublicTest" |
690 apk_under_test = ":chrome_public_apk" | 692 apk_under_test = ":chrome_public_apk" |
691 android_manifest = chrome_public_test_apk_manifest | 693 android_manifest = chrome_public_test_apk_manifest |
692 deps = [ | 694 deps = [ |
693 ":chrome_public_test_apk_manifest", | 695 ":chrome_public_test_apk_manifest", |
694 "//chrome/android:chrome_shared_test_java", | 696 "//chrome/android:chrome_shared_test_java", |
695 ] | 697 ] |
696 isolate_file = "../chrome_public_test_apk.isolate" | 698 isolate_file = "../chrome_public_test_apk.isolate" |
697 } | 699 } |
OLD | NEW |