diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
| commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
| tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/chrome/android/features/ar | |
| parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
| download | qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz | |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/android/features/ar')
| -rw-r--r-- | chromium/chrome/android/features/ar/ar_module_tmpl.gni | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/chromium/chrome/android/features/ar/ar_module_tmpl.gni b/chromium/chrome/android/features/ar/ar_module_tmpl.gni index d61909d5533..4f2329221c6 100644 --- a/chromium/chrome/android/features/ar/ar_module_tmpl.gni +++ b/chromium/chrome/android/features/ar/ar_module_tmpl.gni @@ -8,9 +8,10 @@ import("//chrome/android/features/module_names_to_package_ids.gni") import("//device/vr/buildflags/buildflags.gni") assert(enable_arcore) -assert(modularize_ar) template("ar_module_tmpl") { + assert(defined(invoker.version_code)) + assert(defined(invoker.version_name)) assert(defined(invoker.manifest_package)) assert(defined(invoker.module_name)) assert(defined(invoker.base_module_target)) @@ -31,6 +32,7 @@ template("ar_module_tmpl") { [ "base_module_target", "module_name", + "native_switches", "version_code", "version_name", ]) @@ -41,31 +43,8 @@ template("ar_module_tmpl") { "//third_party/android_deps:com_google_ar_core_java", ] - # We store the arcore shim as a separate .so in the bundle module and only - # load as needed. - if (android_64bit_target_cpu) { - if (defined(invoker.is_64_bit_browser) && invoker.is_64_bit_browser) { - loadable_modules = [ "$root_gen_dir/third_party/android_deps/com_google_ar_core_java/jni/arm64-v8a/libarcore_sdk_c.so" ] - - # TODO(cjgrant): Make this a dummy lib, if SplitCompat properly opens the 64-bit library. - if (build_apk_secondary_abi && invoker.include_32_bit_webview) { - secondary_abi_loadable_modules = [ "$root_gen_dir/third_party/android_deps/com_google_ar_core_java/jni/arm64-v8a/libarcore_sdk_c.so" ] - } - } else { - if (build_apk_secondary_abi) { - secondary_abi_loadable_modules = [ "$root_gen_dir/third_party/android_deps/com_google_ar_core_java/jni/armeabi-v7a/libarcore_sdk_c.so" ] - - # Disguise 32 bit library as 64 bit. This works around a Play Core bug where only 64 bit - # libraries are extracted on 64 bit devices. - # TODO(crbug.com/902859): Remove once bug is fixed. - loadable_modules = [ "$root_gen_dir/third_party/android_deps/com_google_ar_core_java/jni/armeabi-v7a/libarcore_sdk_c.so" ] - } else { - loadable_modules = [ "$root_gen_dir/third_party/android_deps/com_google_ar_core_java/jni/armeabi-v7a/libarcore_sdk_c.so" ] - } - } - } else { - loadable_modules = [ "$root_gen_dir/third_party/android_deps/com_google_ar_core_java/jni/armeabi-v7a/libarcore_sdk_c.so" ] - } + loadable_modules_if_32_bit = [ "$root_gen_dir/third_party/android_deps/com_google_ar_core_java/jni/armeabi-v7a/libarcore_sdk_c.so" ] + loadable_modules_if_64_bit = [ "$root_gen_dir/third_party/android_deps/com_google_ar_core_java/jni/arm64-v8a/libarcore_sdk_c.so" ] uncompress_shared_libraries = true |