Commit 6facaf56 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Ensure bitness strings aren't stripped on Android.

Bug: 1119479
Change-Id: I889ae0f4f01e5e4a79d48fca1172b920a1393a7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363363Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799889}
parent 113e7f3b
......@@ -120,6 +120,16 @@ VersionUI::~VersionUI() {}
// static
int VersionUI::VersionProcessorVariation() {
#if defined(OS_ANDROID)
// When building for Android, "unused" strings are removed. However, binaries
// of both bitnesses are stripped of strings based on string analysis of one
// bitness. Search the code for "generate_resource_whitelist" for more
// information. Therefore, make sure both the IDS_VERSION_UI_32BIT and
// IDS_VERSION_UI_64BIT strings are marked as always used so that they’re
// never stripped. https://crbug.com/1119479
IDS_VERSION_UI_32BIT;
IDS_VERSION_UI_64BIT;
#endif // OS_ANDROID
#if defined(OS_MAC)
switch (base::mac::GetCPUType()) {
case base::mac::CPUType::kIntel:
......
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