Commit 8d856e11 authored by Tibor Goldschwendt's avatar Tibor Goldschwendt Committed by Commit Bot

[ar] Disguise 32 bit ArCore lib as 64 bit

This works around a Play Core bug where only 64 bit libraries are extracted on
64 bit devices.

Bug: 902859,902822
Change-Id: Ifd38850a1a88320860d741c740a754cf7cdf3284
Reviewed-on: https://chromium-review.googlesource.com/c/1324105Reviewed-by: default avataragrieve <agrieve@chromium.org>
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606150}
parent 27a63806
...@@ -43,12 +43,10 @@ template("ar_module_tmpl") { ...@@ -43,12 +43,10 @@ template("ar_module_tmpl") {
if (android_64bit_target_cpu && build_apk_secondary_abi) { if (android_64bit_target_cpu && build_apk_secondary_abi) {
secondary_abi_loadable_modules = [ "//third_party/arcore-android-sdk/libraries/android_arm/libarcore_sdk_c_minimal.so" ] secondary_abi_loadable_modules = [ "//third_party/arcore-android-sdk/libraries/android_arm/libarcore_sdk_c_minimal.so" ]
# Bundletool requires all modules of a bundle to support the same set of # Disguise 32 bit library as 64 bit. This works around a Play Core bug where only 64 bit
# architectures. Monochrome base module supports arm64. Add a zero-byte, # libraries are extracted on 64 bit devices.
# "64 bit" dummy library to trick bundletool into thinking that the AR # TODO(crbug.com/902859): Remove once bug is fixed.
# module does support arm64, too. loadable_modules = [ "//third_party/arcore-android-sdk/libraries/android_arm/libarcore_sdk_c_minimal.so" ]
loadable_modules =
[ "//third_party/arcore-android-sdk/libarcore_dummy.so" ]
} else if (android_64bit_target_cpu && !build_apk_secondary_abi) { } else if (android_64bit_target_cpu && !build_apk_secondary_abi) {
loadable_modules = [ "//third_party/arcore-android-sdk/libraries/android_arm64/libarcore_sdk_c_minimal.so" ] loadable_modules = [ "//third_party/arcore-android-sdk/libraries/android_arm64/libarcore_sdk_c_minimal.so" ]
} else { } else {
......
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