Commit e2ac9895 authored by Ian Vollick's avatar Ian Vollick Committed by Commit Bot

[ar] Disable AR support on 64 bit builds

This configuration does not work, currently.

Bug: 841389
Change-Id: I79a0b357593fbe1a792f6eddab1230ca351bde93
Reviewed-on: https://chromium-review.googlesource.com/1052378
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarMichael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557358}
parent 679c57e5
...@@ -198,12 +198,13 @@ template("monochrome_public_apk_tmpl") { ...@@ -198,12 +198,13 @@ template("monochrome_public_apk_tmpl") {
png_to_webp = true png_to_webp = true
} }
if (enable_arcore) { if (enable_arcore_java) {
deps += [ deps += [
"//third_party/arcore-android-sdk:libarcore_library", "//third_party/arcore-android-sdk:libarcore_library",
"//third_party/arcore-android-sdk:libdynamite_client_java", "//third_party/arcore-android-sdk:libdynamite_client_java",
] ]
}
if (enable_arcore) {
# We store this as a separate .so in the APK and only load as needed. # We store this as a separate .so in the APK and only load as needed.
loadable_modules = [ "${root_out_dir}/libarcore_sdk_c_minimal.so" ] loadable_modules = [ "${root_out_dir}/libarcore_sdk_c_minimal.so" ]
} }
......
...@@ -31,10 +31,16 @@ declare_args() { ...@@ -31,10 +31,16 @@ declare_args() {
# Whether to include VR extras like test APKs in non-VR-specific targets # Whether to include VR extras like test APKs in non-VR-specific targets
include_vr_data = false include_vr_data = false
# TODO(crbug.com/837999): We currently only support arm and arm64 and we are # TODO(crbug.com/837999, crbug.com/841389): We currently only support arm and
# limiting to canary and dev until binary size issues are resolved. # we are limiting to canary and dev until binary size issues are resolved.
enable_arcore = is_android && !is_chromecast && enable_arcore = is_android && !is_chromecast && current_cpu == "arm" &&
(current_cpu == "arm" || current_cpu == "arm64") &&
(android_channel == "default" || android_channel == "dev" || (android_channel == "default" || android_channel == "dev" ||
android_channel == "canary") android_channel == "canary")
# TODO(crbug.com/841389): This should not be necessary once 64 bit is properly
# supported and enable_arcore permits arm64 as well.
enable_arcore_java = is_android && !is_chromecast &&
(current_cpu == "arm" || current_cpu == "arm64") &&
(android_channel == "default" ||
android_channel == "dev" || android_channel == "canary")
} }
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