Skip to content

A
angle
Commit 3ad3a9ac by Yuly Novikov Committed by Commit Bot
Options

Fix and re-enable component build of angle_apks

These were disabled in http://crrev.com/c/1387344, after breaking android-dbg (now android-archive-dbg) in crbug.com/916751. Re-enable them, so that CQ bots can be switched to component build, which is more stable due to http://anglebug.com/4396. The fix is to correct the library names, which have .cr.so suffix in component builds. Bug: angleproject:4483, angleproject:2981, chromium:916751 Change-Id: Ie9cb6e11513ecd2b5e4daa3f636296a4500ddfb9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2800193 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent d62fc236
Showing with 39 additions and 12 deletions
BUILD.gn
...@@ -1265,15 +1265,23 @@ if (angle_standalone || build_with_chromium) { ...@@ -1265,15 +1265,23 @@ if (angle_standalone || build_with_chromium) {
} }
} }
if (!is_component_build && is_android && symbol_level != 0) { if (is_android && symbol_level != 0) {
action_foreach("compressed_symbols") { action_foreach("compressed_symbols") {
sources = [] sources = []
foreach(_library, angle_libraries) { foreach(_library, angle_libraries) {
sources += [ "$root_out_dir/${_library}${angle_libs_suffix}.so" ] if (is_component_build) {
sources += [ "$root_out_dir/${_library}${angle_libs_suffix}.cr.so" ]
} else {
sources += [ "$root_out_dir/${_library}${angle_libs_suffix}.so" ]
}
} }
if (angle_enable_vulkan_validation_layers) { if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) {
sources += [ "$root_out_dir/lib${_layer}.so" ] if (is_component_build) {
sources += [ "$root_out_dir/lib${_layer}.cr.so" ]
} else {
sources += [ "$root_out_dir/lib${_layer}.so" ]
}
} }
} }
...@@ -1311,7 +1319,7 @@ if (!is_component_build && is_android && symbol_level != 0) { ...@@ -1311,7 +1319,7 @@ if (!is_component_build && is_android && symbol_level != 0) {
} }
} }
if (build_with_chromium && !is_component_build && is_android && if (build_with_chromium && is_android &&
current_toolchain == default_toolchain) { current_toolchain == default_toolchain) {
apk_version_code = "0" apk_version_code = "0"
if (angle_enable_commit_id) { if (angle_enable_commit_id) {
......
android/angle_apk.gni
...@@ -72,12 +72,22 @@ if (enable_java_templates) { ...@@ -72,12 +72,22 @@ if (enable_java_templates) {
"root_out_dir") "root_out_dir")
secondary_abi_loadable_modules = [] secondary_abi_loadable_modules = []
foreach(_library, angle_libraries) { foreach(_library, angle_libraries) {
secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}.so" ] if (is_component_build) {
secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}.cr.so" ]
} else {
secondary_abi_loadable_modules += [ "$_secondary_out_dir/lib.compressed/${_library}${angle_libs_suffix}.so" ]
}
} }
if (angle_enable_vulkan_validation_layers) { if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) {
secondary_abi_loadable_modules += if (is_component_build) {
[ "${_secondary_out_dir}/lib.compressed/lib${_layer}.so" ] secondary_abi_loadable_modules += [
"${_secondary_out_dir}/lib.compressed/lib${_layer}.cr.so",
]
} else {
secondary_abi_loadable_modules +=
[ "${_secondary_out_dir}/lib.compressed/lib${_layer}.so" ]
}
} }
} }
} }
...@@ -97,14 +107,23 @@ if (enable_java_templates) { ...@@ -97,14 +107,23 @@ if (enable_java_templates) {
} else { } else {
loadable_modules = [] loadable_modules = []
foreach(_library, angle_libraries) { foreach(_library, angle_libraries) {
loadable_modules += [ if (is_component_build) {
"$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}.so", loadable_modules += [ "$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}.cr.so" ]
] } else {
loadable_modules += [
"$root_out_dir/lib.compressed/${_library}${angle_libs_suffix}.so",
]
}
} }
if (angle_enable_vulkan_validation_layers) { if (angle_enable_vulkan_validation_layers) {
foreach(_layer, vulkan_validation_layers) { foreach(_layer, vulkan_validation_layers) {
loadable_modules += if (is_component_build) {
[ "$root_out_dir/lib.compressed/lib${_layer}.so" ] loadable_modules +=
[ "$root_out_dir/lib.compressed/lib${_layer}.cr.so" ]
} else {
loadable_modules +=
[ "$root_out_dir/lib.compressed/lib${_layer}.so" ]
}
} }
} }
} }
......
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