Commit 6c379288 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Android: Fix chrome_public_apk for is_asan=true

We should not rename libraries when not using crazy linker.

Bug: 1103107
Change-Id: I24431c2818b596cd95b198d08b9670ba1750a380
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2287891
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786327}
parent 588015f6
...@@ -260,6 +260,10 @@ template("chrome_public_common_apk_or_module_tmpl") { ...@@ -260,6 +260,10 @@ template("chrome_public_common_apk_or_module_tmpl") {
} }
} }
if (!defined(use_chromium_linker)) {
use_chromium_linker = chromium_linker_supported
}
if (!_is_monochrome && !_is_trichrome) { if (!_is_monochrome && !_is_trichrome) {
deps += [ deps += [
"//chrome/android:chrome_public_v8_assets", "//chrome/android:chrome_public_v8_assets",
...@@ -276,10 +280,12 @@ template("chrome_public_common_apk_or_module_tmpl") { ...@@ -276,10 +280,12 @@ template("chrome_public_common_apk_or_module_tmpl") {
] ]
# Adds "crazy." prefix to avoid libraries being extracted when installed. # Adds "crazy." prefix to avoid libraries being extracted when installed.
library_renames = [ if (use_chromium_linker) {
"libchrome.so", library_renames = [
"libchromefortest.so", "libchrome.so",
] "libchromefortest.so",
]
}
} }
if (_enable_multidex) { if (_enable_multidex) {
...@@ -327,10 +333,6 @@ template("chrome_public_common_apk_or_module_tmpl") { ...@@ -327,10 +333,6 @@ template("chrome_public_common_apk_or_module_tmpl") {
} }
} }
if (!defined(use_chromium_linker)) {
use_chromium_linker = chromium_linker_supported
}
if (use_chromium_linker) { if (use_chromium_linker) {
_is_trichrome_3264 = _is_trichrome_3264 =
!_is_trichrome || !android_64bit_target_cpu || _is_64_bit_browser !_is_trichrome || !android_64bit_target_cpu || _is_64_bit_browser
......
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