diff --git a/patches/performance/0012-use-64-bit-WebView-processes.patch b/patches/performance/0012-use-64-bit-WebView-processes.patch deleted file mode 100644 index d2d5c34f..00000000 --- a/patches/performance/0012-use-64-bit-WebView-processes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ee80624a6cad6e19a281a59cfea32f406e7ee03d Mon Sep 17 00:00:00 2001 -From: Daniel Micay -Date: Thu, 26 Jan 2017 01:30:12 -0500 -Subject: [PATCH 12/21] use 64-bit WebView processes - ---- - android_webview/apk/java/AndroidManifest.xml | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/android_webview/apk/java/AndroidManifest.xml b/android_webview/apk/java/AndroidManifest.xml -index 23b55ecb437a..3f7212fe2807 100644 ---- a/android_webview/apk/java/AndroidManifest.xml -+++ b/android_webview/apk/java/AndroidManifest.xml -@@ -20,8 +20,7 @@ - - -+ android:multiArch="true"> - {# This part is shared between stand-alone WebView and Monochrome #} - {% macro common(manifest_package, webview_lib) %} - -Date: Wed, 5 Jul 2017 00:22:37 -0400 -Subject: [PATCH 13/21] use 64-bit Monochrome processes - ---- - android_webview/BUILD.gn | 2 ++ - chrome/android/BUILD.gn | 22 ++++++---------------- - chrome/android/chrome_public_apk_tmpl.gni | 8 +------- - chrome/android/java/AndroidManifest_monochrome.xml | 1 - - ...monochrome_android_manifest_jinja_variables.gni | 1 - - 5 files changed, 9 insertions(+), 25 deletions(-) - -diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn -index 6267dbe3aa99..8cee7e02559a 100644 ---- a/android_webview/BUILD.gn -+++ b/android_webview/BUILD.gn -@@ -404,7 +404,9 @@ if (android_64bit_target_cpu) { - "//v8($android_secondary_abi_toolchain)", - ] - } -+} - -+if (android_64bit_target_cpu && current_toolchain == android_secondary_abi_toolchain) { - shared_library("monochrome") { - deps = [ - ":webview_entry_point", -diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index ef704f883f2e..8648e853775b 100644 ---- a/chrome/android/BUILD.gn -+++ b/chrome/android/BUILD.gn -@@ -749,13 +749,7 @@ if (current_toolchain == default_toolchain) { - - if (enable_resource_whitelist_generation) { - generate_resource_whitelist("monochrome_resource_whitelist") { -- # Always use the 32-bit library's whitelist since the 64-bit one is -- # webview-only. -- if (!android_64bit_target_cpu) { -- _fat_lib_toolchain = current_toolchain -- } else { -- _fat_lib_toolchain = android_secondary_abi_toolchain -- } -+ _fat_lib_toolchain = current_toolchain - deps = [ - ":monochrome($_fat_lib_toolchain)", - ] -@@ -869,14 +863,8 @@ if (current_toolchain == default_toolchain) { - } - } # current_toolchain == host_toolchain - --# --# Only 32-bit //chrome/android/monochrome is needed, beside --# being built with 32-bit default toolchain, it is also built --# with secondary 32-bit toolchain in 64-bit platform because we --# need 64-bit //android_webview/monochrome and 32-bit this target --# for 64-bit APK. - if (!android_64bit_target_cpu || -- current_toolchain == android_secondary_abi_toolchain) { -+ current_toolchain != android_secondary_abi_toolchain) { - shared_library("monochrome") { - sources = [ - "../app/android/chrome_main_delegate_android_initializer.cc", -@@ -901,10 +889,12 @@ if (!android_64bit_target_cpu || - - public_configs = extra_chrome_shared_library_configs - } --} else { -+} -+ -+if (android_64bit_target_cpu && current_toolchain != android_secondary_abi_toolchain) { - group("monochrome_secondary_abi_lib") { - public_deps = [ -- ":monochrome($android_secondary_abi_toolchain)", -+ "//android_webview:monochrome($android_secondary_abi_toolchain)", - ] - } - } -diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 5a115915e7ef..7302ab2e15c8 100644 ---- a/chrome/android/chrome_public_apk_tmpl.gni -+++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -98,13 +98,7 @@ template("chrome_public_apk_tmpl") { - - template("monochrome_public_apk_tmpl") { - chrome_public_apk_tmpl(target_name) { -- # Always build 64-bit //android_webview:monochrome because Chrome runs -- # in 32-bit mode. -- if (android_64bit_target_cpu) { -- shared_libraries = [ "//android_webview:monochrome" ] -- } else { -- shared_libraries = [ "//chrome/android:monochrome" ] -- } -+ shared_libraries = [ "//chrome/android:monochrome" ] - if (android_64bit_target_cpu && build_apk_secondary_abi) { - secondary_abi_shared_libraries = - [ "//chrome/android:monochrome_secondary_abi_lib" ] -diff --git a/chrome/android/java/AndroidManifest_monochrome.xml b/chrome/android/java/AndroidManifest_monochrome.xml -index 5ae85dec51d1..934d13d806dc 100644 ---- a/chrome/android/java/AndroidManifest_monochrome.xml -+++ b/chrome/android/java/AndroidManifest_monochrome.xml -@@ -19,7 +19,6 @@ - {{ super() }} - android:multiArch="true" - android:extractNativeLibs="false" --{{use32bitAbi|default('')}} - {% endblock %} - - {% block extra_keyset_definitions %} -diff --git a/chrome/android/monochrome_android_manifest_jinja_variables.gni b/chrome/android/monochrome_android_manifest_jinja_variables.gni -index dcbfa96764a1..8e6d7ccac9e2 100644 ---- a/chrome/android/monochrome_android_manifest_jinja_variables.gni -+++ b/chrome/android/monochrome_android_manifest_jinja_variables.gni -@@ -5,5 +5,4 @@ - monochrome_android_manifest_jinja_variables = [ - "min_sdk_version=24", - "sandboxed_service_exported=true", -- "use32bitAbi=android:use32bitAbi=\"true\"", - ] --- -2.14.2 -