Commit 12476926 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Fix Trichrome.ssargs file for arm64

Adds --no-native to TrichromeLibrary.apk so that supersize does not try
and break down the 32-bit libmonochrome.so (same as we do for
Monochrome.apk)

Bug: 1126337
Change-Id: Ia91c3179b3a3877671689661479b1e0a20962f4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404959
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarSamuel Huang <huangs@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806196}
parent 15e52341
...@@ -209,17 +209,25 @@ template("trichrome_library_apk_tmpl") { ...@@ -209,17 +209,25 @@ template("trichrome_library_apk_tmpl") {
# parameters, and is used by SuperSize-archive to create multi-container .size # parameters, and is used by SuperSize-archive to create multi-container .size
# files. This is used to support SuperSize on Trichrome. # files. This is used to support SuperSize on Trichrome.
template("write_ssargs_trichrome") { template("write_ssargs_trichrome") {
if (target_cpu == "arm64" || target_cpu == "x64") {
# Ignore secondary abi libmonochrome in library apk in favor of primary one
# in TrichromeWebView.
_library_args = " --no-native"
} else {
_library_args = ""
}
# Base names (i.e., no full path) are used because .ssargs files specifies # Base names (i.e., no full path) are used because .ssargs files specifies
# files using paths relative to itself. It is expected for |ssargs_path| to # files using paths relative to itself. It is expected for |ssargs_path| to
# be in the same directory as all Trichrome files whose sizes are measured # be in the same directory as all Trichrome files whose sizes are measured
# by SuperSize. # by SuperSize.
ssargs_lines = [ _lines = [
"# Written by build target \"${target_name}.\"", "# Written by build target \"${target_name}.\"",
"Library -f ${invoker.trichrome_library_basename}", "Library -f ${invoker.trichrome_library_basename}$_library_args",
"# Add --no-native to Chrome as workaround for crbug.com/1103271.", "# Add --no-native to Chrome as workaround for crbug.com/1103271.",
"Chrome -f ${invoker.trichrome_chrome_basename} --no-native", "Chrome -f ${invoker.trichrome_chrome_basename} --no-native",
"WebView -f ${invoker.trichrome_webview_basename}", "WebView -f ${invoker.trichrome_webview_basename}",
] ]
write_file(invoker.ssargs_path, ssargs_lines) write_file(invoker.ssargs_path, _lines)
} }
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