Commit bdb4a07d authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Fix enable_chrome_module component build again for arm64

I only verified my first fix on arm and not arm64. The libs from DFMs
need to be in secondary_abi_shared_libraries if we're building on arm64
with a non-64 bit browser.

Bug: 1126301
Change-Id: I7cf497b875cce6a28dc81873ef8f244969b60382
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490668
Auto-Submit: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819643}
parent b029926e
...@@ -542,7 +542,11 @@ template("monochrome_public_common_apk_or_module_tmpl") { ...@@ -542,7 +542,11 @@ template("monochrome_public_common_apk_or_module_tmpl") {
} }
deps += [ ":${target_name}__all_chrome_resources" ] deps += [ ":${target_name}__all_chrome_resources" ]
if (is_component_build) { if (is_component_build) {
shared_libraries += _chrome_module_shared_lib_deps if (android_64bit_target_cpu && !invoker.is_64_bit_browser) {
secondary_abi_shared_libraries += _chrome_module_shared_lib_deps
} else {
shared_libraries += _chrome_module_shared_lib_deps
}
} else { } else {
deps += _chrome_module_shared_lib_deps deps += _chrome_module_shared_lib_deps
} }
......
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