diff --git a/build/patches/Disable-conversion-measurement-api.patch b/build/patches/Disable-conversion-measurement-api.patch index ebff484b..e795e8ef 100644 --- a/build/patches/Disable-conversion-measurement-api.patch +++ b/build/patches/Disable-conversion-measurement-api.patch @@ -11,22 +11,39 @@ being sent and being saved to disk, although it is currently in uncalled code. Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html --- - .../embedder_support/origin_trials/features.cc | 8 ++++---- - .../render_view_context_menu_base.cc | 3 --- - .../aggregatable_report_sender.cc | 15 +++++++-------- - .../attribution_reporting/attribution_host.cc | 1 + - .../attribution_manager_impl.cc | 1 + - .../attribution_report_network_sender.cc | 9 +++++++++ - .../attribution_storage_sql.cc | 8 +++++--- - content/browser/storage_partition_impl.cc | 8 +------- - content/public/browser/navigation_controller.cc | 1 - - content/renderer/render_thread_impl.cc | 5 ++++- - services/network/public/cpp/attribution_utils.cc | 3 +++ - third_party/blink/common/features.cc | 8 ++++---- - .../platform/runtime_enabled_features.json5 | 7 +++++++ - ui/base/ui_base_features.cc | 2 +- - 14 files changed, 47 insertions(+), 32 deletions(-) + chrome/android/java/AndroidManifest.xml | 1 - + .../origin_trials/features.cc | 8 +- + .../render_view_context_menu_base.cc | 3 - + .../aggregatable_report_sender.cc | 15 ++-- + .../aggregation_service_features.cc | 4 +- + .../attribution_data_host_manager_impl.cc | 5 ++ + .../attribution_reporting/attribution_host.cc | 1 + + .../attribution_manager_impl.cc | 1 + + .../attribution_report_network_sender.cc | 9 ++ + .../attribution_storage_sql.cc | 8 +- + content/browser/storage_partition_impl.cc | 8 +- + content/public/android/BUILD.gn | 2 - + .../browser/AttributionOsLevelManager.java | 89 +------------------ + .../public/browser/navigation_controller.cc | 1 - + content/public/common/content_features.cc | 4 +- + content/renderer/render_thread_impl.cc | 5 +- + .../network/public/cpp/attribution_utils.cc | 3 + + third_party/blink/common/features.cc | 16 ++-- + .../platform/runtime_enabled_features.json5 | 7 ++ + ui/base/ui_base_features.cc | 2 +- + 20 files changed, 63 insertions(+), 129 deletions(-) +diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml +--- a/chrome/android/java/AndroidManifest.xml ++++ b/chrome/android/java/AndroidManifest.xml +@@ -39,7 +39,6 @@ by a child template that "extends" this file. + + {% endif %} + +- + + +