Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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/config/locales.gni") | 7 import("//build/config/locales.gni") |
| 8 import("//tools/grit/repack.gni") | 8 import("//tools/grit/repack.gni") |
| 9 import("system_webview_apk_tmpl.gni") | 9 import("system_webview_apk_tmpl.gni") |
| 10 import("webview_repack_locales.gni") | 10 import("webview_repack_locales.gni") |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 # Chrome. | 149 # Chrome. |
| 150 android_assets("monochrome_webview_assets") { | 150 android_assets("monochrome_webview_assets") { |
| 151 sources = [ | 151 sources = [ |
| 152 webview_license_path, | 152 webview_license_path, |
| 153 ] | 153 ] |
| 154 deps = [ | 154 deps = [ |
| 155 ":generate_webview_license_notice", | 155 ":generate_webview_license_notice", |
| 156 "//third_party/icu:icu_assets", | 156 "//third_party/icu:icu_assets", |
| 157 "//v8:v8_external_startup_data_assets", | 157 "//v8:v8_external_startup_data_assets", |
| 158 ] | 158 ] |
| 159 if (android_64bit_target_cpu && !build_64bit_only_webview) { | |
|
Torne
2016/09/19 13:36:28
Doesn't this file need to include the new config.g
michaelbai
2016/09/19 21:22:25
No, it doesn't, build_64bit_only_webview's definit
| |
| 160 deps += [ ":v8_snapshot_secondary_abi_assets" ] | |
| 161 } | |
| 159 } | 162 } |
| 160 | 163 |
| 161 android_assets("assets") { | 164 android_assets("assets") { |
| 162 deps = [ | 165 deps = [ |
| 163 ":monochrome_webview_assets", | 166 ":monochrome_webview_assets", |
| 164 ":pak_file_assets", | 167 ":pak_file_assets", |
| 165 ] | 168 ] |
| 166 } | 169 } |
| 167 | 170 |
| 168 action("generate_webview_license_notice") { | 171 action("generate_webview_license_notice") { |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 389 } | 392 } |
| 390 | 393 |
| 391 shared_library("libwebviewchromium") { | 394 shared_library("libwebviewchromium") { |
| 392 deps = [ | 395 deps = [ |
| 393 ":webview_entry_point", | 396 ":webview_entry_point", |
| 394 ] | 397 ] |
| 395 configs -= [ "//build/config/android:hide_native_jni_exports" ] | 398 configs -= [ "//build/config/android:hide_native_jni_exports" ] |
| 396 } | 399 } |
| 397 | 400 |
| 398 if (android_64bit_target_cpu) { | 401 if (android_64bit_target_cpu) { |
| 402 android_assets("v8_snapshot_secondary_abi_assets") { | |
| 403 _secondary_abi_toolchain_name = | |
| 404 get_label_info(android_secondary_abi_toolchain, "name") | |
| 405 _secondary_abi_out_dir = | |
|
agrieve
2016/09/19 14:29:18
it would be better to get this via:
_secondary_a
michaelbai
2016/09/19 21:22:26
Done.
| |
| 406 rebase_path("$root_build_dir/$_secondary_abi_toolchain_name") | |
| 407 | |
| 408 assert(android_64bit_target_cpu, | |
| 409 "32-bit targets shouldn't have secondary abi") | |
| 410 arch_suffix = "32" | |
| 411 renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ] | |
| 412 renaming_destinations = [ "snapshot_blob_$arch_suffix.bin" ] | |
| 413 disable_compression = true | |
| 414 deps = [ | |
| 415 "//v8($android_secondary_abi_toolchain)", | |
| 416 ] | |
| 417 } | |
| 418 | |
| 399 shared_library("monochrome") { | 419 shared_library("monochrome") { |
| 400 deps = [ | 420 deps = [ |
| 401 ":webview_entry_point", | 421 ":webview_entry_point", |
| 402 ] | 422 ] |
| 403 configs -= [ "//build/config/android:hide_native_jni_exports" ] | 423 configs -= [ "//build/config/android:hide_native_jni_exports" ] |
| 404 } | 424 } |
| 405 } | 425 } |
| 406 | 426 |
| 407 source_set("common") { | 427 source_set("common") { |
| 408 sources = [ | 428 sources = [ |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 788 system_webview_apk_tmpl("system_webview_apk") { | 808 system_webview_apk_tmpl("system_webview_apk") { |
| 789 android_manifest = system_webview_android_manifest | 809 android_manifest = system_webview_android_manifest |
| 790 android_manifest_dep = ":system_webview_manifest" | 810 android_manifest_dep = ":system_webview_manifest" |
| 791 deps = [ | 811 deps = [ |
| 792 ":system_webview_resources", | 812 ":system_webview_resources", |
| 793 "//android_webview/glue", | 813 "//android_webview/glue", |
| 794 ] | 814 ] |
| 795 apk_name = "SystemWebView" | 815 apk_name = "SystemWebView" |
| 796 } | 816 } |
| 797 } | 817 } |
| OLD | NEW |