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 && | |
| 160 (!defined(build_64bit_only_webview) || !build_64bit_only_webview)) { | |
|
jbudorick
2016/09/16 16:23:35
nit: this might be more readable as
android_64bit
michaelbai
2016/09/16 20:05:55
could be more simple
android_64bit_target_cpu &&
| |
| 161 deps += [ ":v8_snapshot_secondary_abi_assets" ] | |
| 162 } | |
| 159 } | 163 } |
| 160 | 164 |
| 161 android_assets("assets") { | 165 android_assets("assets") { |
| 162 deps = [ | 166 deps = [ |
| 163 ":monochrome_webview_assets", | 167 ":monochrome_webview_assets", |
| 164 ":pak_file_assets", | 168 ":pak_file_assets", |
| 165 ] | 169 ] |
| 166 } | 170 } |
| 167 | 171 |
| 168 action("generate_webview_license_notice") { | 172 action("generate_webview_license_notice") { |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 389 } | 393 } |
| 390 | 394 |
| 391 shared_library("libwebviewchromium") { | 395 shared_library("libwebviewchromium") { |
| 392 deps = [ | 396 deps = [ |
| 393 ":webview_entry_point", | 397 ":webview_entry_point", |
| 394 ] | 398 ] |
| 395 configs -= [ "//build/config/android:hide_native_jni_exports" ] | 399 configs -= [ "//build/config/android:hide_native_jni_exports" ] |
| 396 } | 400 } |
| 397 | 401 |
| 398 if (android_64bit_target_cpu) { | 402 if (android_64bit_target_cpu) { |
| 403 group("webviewchromium_secondary_abi_lib") { | |
|
jbudorick
2016/09/16 16:23:35
Can system_webview_apk_tmpl use :libwebviewchromiu
michaelbai
2016/09/16 20:05:55
Thanks to spot it, I were copying this from Monoch
| |
| 404 public_deps = [ | |
| 405 ":libwebviewchromium($android_secondary_abi_toolchain)", | |
| 406 ] | |
| 407 } | |
| 408 | |
| 409 android_assets("v8_snapshot_secondary_abi_assets") { | |
|
jbudorick
2016/09/16 16:23:35
This appears to be unused. Are you planning to use
Torne
2016/09/16 16:37:57
It will be used by the downstream monochrome targe
michaelbai
2016/09/16 20:05:55
It is used in line 161
| |
| 410 _secondary_abi_toolchain_name = | |
| 411 get_label_info(android_secondary_abi_toolchain, "name") | |
| 412 _secondary_abi_out_dir = | |
| 413 rebase_path("$root_build_dir/$_secondary_abi_toolchain_name") | |
| 414 | |
| 415 assert(android_64bit_target_cpu, | |
| 416 "32-bit targets shouldn't have secondary abi") | |
| 417 arch_suffix = "32" | |
| 418 renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ] | |
| 419 renaming_destinations = [ "snapshot_blob_$arch_suffix.bin" ] | |
| 420 disable_compression = true | |
| 421 deps = [ | |
| 422 "//v8($android_secondary_abi_toolchain)", | |
| 423 ] | |
| 424 } | |
| 425 | |
| 399 shared_library("monochrome") { | 426 shared_library("monochrome") { |
| 400 deps = [ | 427 deps = [ |
| 401 ":webview_entry_point", | 428 ":webview_entry_point", |
| 402 ] | 429 ] |
| 403 configs -= [ "//build/config/android:hide_native_jni_exports" ] | 430 configs -= [ "//build/config/android:hide_native_jni_exports" ] |
| 404 } | 431 } |
| 405 } | 432 } |
| 406 | 433 |
| 407 source_set("common") { | 434 source_set("common") { |
| 408 sources = [ | 435 sources = [ |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 788 system_webview_apk_tmpl("system_webview_apk") { | 815 system_webview_apk_tmpl("system_webview_apk") { |
| 789 android_manifest = system_webview_android_manifest | 816 android_manifest = system_webview_android_manifest |
| 790 android_manifest_dep = ":system_webview_manifest" | 817 android_manifest_dep = ":system_webview_manifest" |
| 791 deps = [ | 818 deps = [ |
| 792 ":system_webview_resources", | 819 ":system_webview_resources", |
| 793 "//android_webview/glue", | 820 "//android_webview/glue", |
| 794 ] | 821 ] |
| 795 apk_name = "SystemWebView" | 822 apk_name = "SystemWebView" |
| 796 } | 823 } |
| 797 } | 824 } |
| OLD | NEW |