Skip to content

GitLab

T
tangled
Commit 50ab16b8 authored by Christopher Grant's avatar Christopher Grant Committed by Commit Bot
Browse files
Options

Introduce bundle-specific native libraries 

This will allow native code to be stripped out of the main library
when it moves to a Dynamic Feature Module.  For now, the libraries will
be identical.

BUG=874584

Change-Id: I8a54e6402a3686939dd14b509c614da99b0ff913
Reviewed-on: https://chromium-review.googlesource.com/c/1332248Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarDavid Turner <digit@chromium.org>
Reviewed-by: default avatarTibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608519}
parent 5e4780da
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 42 deletions
chrome/android/BUILD.gn
View file @ 50ab16b8
......@@ -1056,14 +1056,27 @@ template("chrome_shared_library") {
}
}
chrome_shared_library("libchrome") {
sources = [
"../browser/android/chrome_entry_point.cc",
chrome_jni_registration_header,
]
deps = [
":chrome_jni_registration($default_toolchain)",
]
# This template creates a native library for Chrome's APK or bundle.
template("libchrome_apk_or_bundle_tmpl") {
chrome_shared_library(target_name) {
forward_variables_from(invoker, "*")
sources = [
"../browser/android/chrome_entry_point.cc",
chrome_jni_registration_header,
]
deps = [
":chrome_jni_registration($default_toolchain)",
]
}
}
# Chrome APK's native library.
libchrome_apk_or_bundle_tmpl("libchrome") {
}
# Chrome bundle's base module native library. This is currently the same as the
# APK version, but will diverge when code moves into feature modules.
libchrome_apk_or_bundle_tmpl("libchrome_base") {
}
chrome_shared_library("libchromefortest") {
......@@ -1113,22 +1126,20 @@ if (current_toolchain == default_toolchain) {
# is_monochrome: If true, generate Monochrome targets rather than Chrome.
# is_bundle: If true, generate resources for bundles rather than APK.
template("resource_packaging") {
not_needed([ "target_name" ])
_is_monochrome = invoker.is_monochrome
_is_bundle = invoker.is_bundle
if (_is_monochrome) {
_prefix = "monochrome"
_type = "monochrome"
} else {
_prefix = "chrome"
_type = "chrome"
}
if (_is_bundle) {
_output_type = "bundle"
} else {
_output_type = "apk"
}
_variant = "${_prefix}_${_output_type}"
_variant = "${_type}_${_output_type}"
if (enable_resource_whitelist_generation) {
_resource_whitelist_target = "${_variant}_resource_whitelist"
......@@ -1136,10 +1147,17 @@ if (current_toolchain == default_toolchain) {
"$target_gen_dir/${_variant}_resource_whitelist.txt"
if (_is_monochrome) {
_target = "monochrome"
_target_prefix = ""
} else {
_target = "libchrome"
_target_prefix = "lib"
}
if (_is_bundle) {
_suffix = "_base"
} else {
_suffix = ""
}
_lib_path = "/lib.unstripped/lib" + _type + _suffix + shlib_extension
_lib_target = _target_prefix + _type + _suffix
generate_resource_whitelist(_resource_whitelist_target) {
_fat_lib_toolchain = ""
......@@ -1153,11 +1171,10 @@ if (current_toolchain == default_toolchain) {
}
}
deps = [
":${_target}($_fat_lib_toolchain)",
":${_lib_target}($_fat_lib_toolchain)",
]
input = get_label_info(deps[0], "root_out_dir") +
"/lib.unstripped/lib${_prefix}$shlib_extension"
input = get_label_info(deps[0], "root_out_dir") + _lib_path
output = _resource_whitelist_file
}
......@@ -1169,10 +1186,9 @@ if (current_toolchain == default_toolchain) {
_locale_whitelist_target = "${_variant}_locale_whitelist"
_locale_whitelist_file =
"$target_gen_dir/${_variant}_locale_whitelist.txt"
_system_webview_locale_resource_id_list =
"$target_gen_dir/system_webview_locale_resource_id_list.txt"
_system_webview_locale_resource_id_list = "$target_gen_dir/${_variant}_system_webview_locale_resource_id_list.txt"
action("system_webview_locale_resource_id_list") {
action("${_variant}_system_webview_locale_resource_id_list") {
script = "//tools/grit/pak_util.py"
_system_webview_en_US_locale_pak =
......@@ -1213,7 +1229,7 @@ if (current_toolchain == default_toolchain) {
deps = [
":${_resource_whitelist_target}",
":system_webview_locale_resource_id_list",
":${_variant}_system_webview_locale_resource_id_list",
"//android_webview:system_webview_pak_whitelist",
]
......@@ -1231,7 +1247,7 @@ if (current_toolchain == default_toolchain) {
}
chrome_paks("${_variant}_paks") {
output_dir = "$target_gen_dir/$target_name"
output_dir = "$target_gen_dir/${_variant}_paks"
deps = []
if (_is_monochrome) {
......@@ -1268,7 +1284,8 @@ if (current_toolchain == default_toolchain) {
}
# This target explicitly includes locale paks via deps.
android_assets("${_variant}_pak_assets") {
android_assets(target_name) {
assert("${_variant}_pak_assets" == target_name)
sources = [
"$target_gen_dir/${_variant}_paks/chrome_100_percent.pak",
"$target_gen_dir/${_variant}_paks/resources.pak",
......@@ -1285,14 +1302,24 @@ if (current_toolchain == default_toolchain) {
}
}
resource_packaging("") {
# Resource packaging varies with Monochrome and bundles because the pak
# resource whitelist is derived from the native library.
resource_packaging("chrome_apk_pak_assets") {
is_monochrome = false
is_bundle = false
}
resource_packaging("") {
resource_packaging("monochrome_apk_pak_assets") {
is_monochrome = true
is_bundle = false
}
resource_packaging("chrome_bundle_pak_assets") {
is_monochrome = false
is_bundle = true
}
resource_packaging("monochrome_bundle_pak_assets") {
is_monochrome = true
is_bundle = true
}
# TODO(cjgrant): Remove this temporary alias after downstream renaming lands.
java_group("chrome_public_pak_assets") {
......@@ -1310,17 +1337,29 @@ if (current_toolchain == default_toolchain) {
# for 64-bit APK.
if (!android_64bit_target_cpu ||
current_toolchain == android_secondary_abi_toolchain) {
chrome_common_shared_library("monochrome") {
sources = [
"../browser/android/monochrome_entry_point.cc",
]
deps = [
"//android_webview:common",
]
# Monochrome equivalent of Chrome's APK or bundle library template.
template("libmonochrome_apk_or_bundle_tmpl") {
chrome_common_shared_library(target_name) {
forward_variables_from(invoker, "*")
sources = [
"../browser/android/monochrome_entry_point.cc",
]
deps = [
"//android_webview:common",
]
export_java_symbols = true
enable_compressed_relocations = use_lld
use_gnu_hash_style = true
export_java_symbols = true
enable_compressed_relocations = use_lld
use_gnu_hash_style = true
}
}
# Monochrome APK native library.
libmonochrome_apk_or_bundle_tmpl("monochrome") {
}
# Monochrome bundle native library.
libmonochrome_apk_or_bundle_tmpl("monochrome_base") {
}
} else {
group("monochrome_secondary_abi_lib") {
......@@ -1360,7 +1399,6 @@ _chrome_public_shared_deps = [
":chrome_public_apk_resources",
":chrome_public_base_module_java",
":chrome_public_non_pak_assets",
":chrome_apk_pak_assets",
]
generate_jni("test_support_jni_headers") {
......@@ -1443,10 +1481,18 @@ template("chrome_public_apk_or_module_tmpl") {
android_manifest_dep = ":chrome_public_android_manifest"
}
shared_libraries = [ ":libchrome" ]
if (invoker.target_type == "android_app_bundle_module") {
deps += [ ":chrome_bundle_pak_assets" ]
_suffix = "_base"
} else {
deps += [ ":chrome_apk_pak_assets" ]
_suffix = ""
}
shared_libraries = [ ":libchrome${_suffix}" ]
add_unwind_tables_in_apk = _add_unwind_tables_in_chrome_public_apk
if (_add_unwind_tables_in_chrome_public_apk) {
shared_library_for_unwind_asset = "chrome"
shared_library_for_unwind_asset = "chrome${_suffix}"
}
# Android supports webp transparent resources properly since API level 18,
......@@ -1558,7 +1604,11 @@ template("monochrome_public_apk_or_module_tmpl") {
_add_unwind_tables_in_chrome_public_apk &&
(!defined(use_trichrome_library) || !use_trichrome_library)
if (add_unwind_tables_in_apk && can_unwind_with_cfi_table) {
shared_library_for_unwind_asset = "monochrome"
if (invoker.target_type == "android_app_bundle_module") {
shared_library_for_unwind_asset = "monochrome_base"
} else {
shared_library_for_unwind_asset = "monochrome"
}
}
version_name = chrome_version_name
......@@ -1702,6 +1752,7 @@ template("chrome_test_apk_tmpl") {
}
deps = _chrome_public_shared_deps + invoker.deps + [
":chrome_apk_pak_assets",
":chrome_public_base_module_java_for_test",
"//third_party/android_support_test_runner:runner_java",
"//third_party/android_tools:android_test_base_java",
......
chrome/android/chrome_public_apk_tmpl.gni
View file @ 50ab16b8
......@@ -209,7 +209,11 @@ template("monochrome_public_common_apk_or_module_tmpl") {
if (android_64bit_target_cpu) {
shared_libraries = [ "//android_webview:monochrome" ]
} else {
shared_libraries = [ "//chrome/android:monochrome" ]
if (invoker.target_type == "android_app_bundle_module") {
shared_libraries = [ "//chrome/android:monochrome_base" ]
} else {
shared_libraries = [ "//chrome/android:monochrome" ]
}
}
if (android_64bit_target_cpu && build_apk_secondary_abi) {
secondary_abi_shared_libraries =
......@@ -265,9 +269,13 @@ template("monochrome_public_common_apk_or_module_tmpl") {
"//android_webview/apk:webview_license_activity_java",
"//android_webview/glue",
"//chrome/android:chrome_public_non_pak_assets",
"//chrome/android:monochrome_apk_pak_assets",
"//chrome/android/monochrome:monochrome_license_provider_java",
]
if (invoker.target_type == "android_app_bundle_module") {
deps += [ "//chrome/android:monochrome_bundle_pak_assets" ]
} else {
deps += [ "//chrome/android:monochrome_apk_pak_assets" ]
}
if (_enable_multidex && invoker.target_type == "android_apk" &&
!defined(invoker.negative_main_dex_globs)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment