Release 72.0.3626.81

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 72.0.3626.81
+* serve empty content for blocked scripts/images (fixes https://github.com/bromite/bromite/issues/238)
+* keep support of Jelly Bean (workaround for upstream https://bugs.chromium.org/p/chromium/issues/detail?id=923477)
+
+# 72.0.3626.73
+
 # 72.0.3626.68
 * do not ignore save prompt for users without SD card (workaround for upstream wontfix https://bugs.chromium.org/p/chromium/issues/detail?id=916606)
 * remove third_party/analytics patch (now fixed upstream in https://chromium.googlesource.com/chromium/src.git/+/64d6a56f094efbab83802c07ad3ddffa014f9903)

build/GN_ARGS

@@ -3,6 +3,7 @@ blink_symbol_level=1
 dcheck_always_on=false
 debuggable_apks=false
 enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false
+enable_av1_decoder=true
 enable_hangout_services_extension=false
 enable_mdns=false
 enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true

build/patches/Add-bookmark-import-export-actions-in-bookmarks-activity-and-page.patch

@@ -358,7 +358,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
      "bookmarks/bookmark_model_factory.cc",
      "bookmarks/bookmark_model_factory.h",
      "bookmarks/bookmark_stats.cc",
-@@ -2614,8 +2618,6 @@ jumbo_split_static_library("browser") {
+@@ -2616,8 +2620,6 @@ jumbo_split_static_library("browser") {
        "banners/app_banner_infobar_delegate_desktop.h",
        "banners/app_banner_manager_desktop.cc",
        "banners/app_banner_manager_desktop.h",
@@ -367,7 +367,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
        "certificate_viewer.h",
        "chrome_browser_field_trials_desktop.cc",
        "chrome_browser_field_trials_desktop.h",
-@@ -2704,8 +2706,6 @@ jumbo_split_static_library("browser") {
+@@ -2706,8 +2708,6 @@ jumbo_split_static_library("browser") {
        "importer/importer_uma.h",
        "importer/in_process_importer_bridge.cc",
        "importer/in_process_importer_bridge.h",

build/patches/Add-custom-tab-intents-privacy-option.patch

@@ -41,7 +41,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDispatcher.java
-@@ -39,6 +39,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
+@@ -41,6 +41,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
  import org.chromium.chrome.browser.notifications.NotificationPlatformBridge;
  import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
  import org.chromium.chrome.browser.profiles.Profile;
@@ -49,7 +49,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/LaunchIntentDis
  import org.chromium.chrome.browser.searchwidget.SearchActivity;
  import org.chromium.chrome.browser.tab.Tab;
  import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
-@@ -273,6 +274,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
+@@ -275,6 +276,7 @@ public class LaunchIntentDispatcher implements IntentHandler.IntentHandlerDelega
       */
      public static boolean isCustomTabIntent(Intent intent) {
          if (intent == null) return false;

build/patches/Bromite-adblock-engine.patch

@@ -18,12 +18,12 @@ New mechanism for adblocking based on Brave's adblocking hook
  .../browser/appmenu/AppMenuPropertiesDelegate.java |  38 +++
  .../CustomTabAppMenuPropertiesDelegate.java        |   2 +
  .../java/strings/android_chrome_strings.grd        |  11 +
- chrome/browser/net/chrome_network_delegate.cc      |  62 ++++
+ chrome/browser/net/chrome_network_delegate.cc      |  75 +++++
  .../subresource_filter_content_settings_manager.cc |   1 +
  net/BUILD.gn                                       |   7 +
  net/url_request/adblock_intercept.cc               | 341 +++++++++++++++++++++
  net/url_request/adblock_intercept.h                |  41 +++
- 12 files changed, 542 insertions(+)
+ 12 files changed, 555 insertions(+)
  create mode 100644 net/url_request/adblock_intercept.cc
  create mode 100644 net/url_request/adblock_intercept.h
 
@@ -213,11 +213,13 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
  #endif
  
  #if defined(OS_CHROMEOS)
-@@ -193,16 +195,76 @@ void ChromeNetworkDelegate::set_cookie_settings(
+@@ -193,16 +195,89 @@ void ChromeNetworkDelegate::set_cookie_settings(
    cookie_settings_ = cookie_settings;
  }
  
 +#define TRANSPARENT1PXGIF "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
++#define EMPTYJS "data:text/javascript;base64,Cg=="
++#define EMPTYCSS "data:text/css;base64,Cg=="
 +
  int ChromeNetworkDelegate::OnBeforeURLRequest(
      net::URLRequest* request,
@@ -268,12 +270,21 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
 +      }
 +
 +      if (block) {
-+        if (content::RESOURCE_TYPE_IMAGE == info->GetResourceType()) {
-+          *new_url = GURL(TRANSPARENT1PXGIF);
-+        } else {
-+          *new_url = GURL("");
++        switch (info->GetResourceType()) {
++          case content::RESOURCE_TYPE_IMAGE:
++          case content::RESOURCE_TYPE_FAVICON:
++            *new_url = GURL(TRANSPARENT1PXGIF);
++            break;
++          case content::RESOURCE_TYPE_SCRIPT:
++            *new_url = GURL(EMPTYJS);
++            break;
++          case content::RESOURCE_TYPE_STYLESHEET:
++            *new_url = GURL(EMPTYCSS);
++            break;
++          default:
++            *new_url = GURL("");
++            return net::ERR_BLOCKED_BY_ADMINISTRATOR;
 +        }
-+        return net::ERR_BLOCKED_BY_ADMINISTRATOR;
 +      }
 +    } // valid URL and info
 +  } // request
@@ -286,6 +297,8 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
  }
  
 +#undef TRANSPARENT1PXGIF
++#undef EMPTYJS
++#undef EMPTYCSS
 +
  int ChromeNetworkDelegate::OnBeforeStartTransaction(
      net::URLRequest* request,

build/patches/Disable-Omaha-update-checks.patch

@@ -36,7 +36,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/VersionNu
 diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
 --- a/chrome/browser/android/chrome_feature_list.cc
 +++ b/chrome/browser/android/chrome_feature_list.cc
-@@ -350,7 +350,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
+@@ -351,7 +351,7 @@ const base::Feature kIntentBlockExternalFormRedirectsNoGesture{
      base::FEATURE_ENABLED_BY_DEFAULT};
  
  const base::Feature kJellyBeanSupported{"JellyBeanSupported",

build/patches/Remove-help-menu-item.patch

@@ -56,7 +56,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcu
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
-@@ -1405,7 +1405,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
+@@ -1410,7 +1410,7 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
      public boolean onMenuOrKeyboardAction(int id, boolean fromMenu) {
          // Disable creating new tabs, bookmark, history, print, help, focus_url, etc.
          if (id == R.id.focus_url_bar || id == R.id.all_bookmarks_menu_id

build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch

@@ -0,0 +1,401 @@
+From: csagan5 <32685696+csagan5@users.noreply.github.com>
+Date: Tue, 29 Jan 2019 01:02:07 +0100
+Subject: Rollback android:minSdkVersion from 19 (KitKat) to 16 (JellyBean)."
+
+This reverts commit 9a48587dbd1988cf5066b454e7d09ae35d124366.
+---
+ .../test/embedded_test_server/java/AndroidManifest.xml            | 2 +-
+ android_webview/tools/automated_ui_tests/java/AndroidManifest.xml | 2 +-
+ base/android/jni_generator/AndroidManifest.xml                    | 2 +-
+ build/android/AndroidManifest.xml                                 | 2 +-
+ build/android/gradle/android.jinja                                | 2 +-
+ chrome/android/BUILD.gn                                           | 8 ++++----
+ chrome/android/java/res/layout/autofill_local_card_editor.xml     | 4 ++--
+ .../test/android/chrome_public_test_support/AndroidManifest.xml   | 2 +-
+ components/cronet/android/sample/AndroidManifest.xml              | 3 +--
+ components/cronet/android/sample/javatests/AndroidManifest.xml    | 3 +--
+ components/cronet/android/test/javaperftests/AndroidManifest.xml  | 3 +--
+ components/cronet/android/test/javatests/AndroidManifest.xml      | 3 +--
+ .../test/android/browsertests_apk/AndroidManifest.xml.jinja2      | 2 +-
+ content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 | 2 +-
+ content/shell/android/javatests/AndroidManifest.xml               | 2 +-
+ content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2  | 2 +-
+ content/shell/android/shell_apk/AndroidManifest.xml.jinja2        | 2 +-
+ docs/android_build_instructions.md                                | 2 +-
+ mojo/public/java/system/javatests/AndroidManifest.xml             | 2 +-
+ net/android/unittest_support/AndroidManifest.xml                  | 2 +-
+ net/test/android/javatests/AndroidManifest.xml                    | 2 +-
+ remoting/android/java/AndroidManifest.xml.jinja2                  | 2 +-
+ remoting/android/javatests/AndroidManifest.xml.jinja2             | 2 +-
+ testing/android/driver/java/AndroidManifest.xml                   | 2 +-
+ testing/android/native_test/java/AndroidManifest.xml.jinja2       | 2 +-
+ tools/android/audio_focus_grabber/java/AndroidManifest.xml        | 2 +-
+ tools/android/push_apps_to_background/AndroidManifest.xml         | 2 +-
+ 27 files changed, 31 insertions(+), 35 deletions(-)
+
+diff --git a/android_webview/test/embedded_test_server/java/AndroidManifest.xml b/android_webview/test/embedded_test_server/java/AndroidManifest.xml
+--- a/android_webview/test/embedded_test_server/java/AndroidManifest.xml
++++ b/android_webview/test/embedded_test_server/java/AndroidManifest.xml
+@@ -8,7 +8,7 @@
+     xmlns:tools="http://schemas.android.com/tools"
+     package="org.chromium.android_webview.test.support">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+     <uses-permission android:name="android.permission.INTERNET"/>
+ 
+diff --git a/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml b/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml
+--- a/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml
++++ b/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml
+@@ -10,7 +10,7 @@
+     android:versionCode="1"
+     android:versionName="1.0" >
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+ 
+     <uses-permission android:name="android.permission.INTERNET" />
+     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+diff --git a/base/android/jni_generator/AndroidManifest.xml b/base/android/jni_generator/AndroidManifest.xml
+--- a/base/android/jni_generator/AndroidManifest.xml
++++ b/base/android/jni_generator/AndroidManifest.xml
+@@ -7,7 +7,7 @@
+ 
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jni.generator">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
+     <application></application>
+ 
+ </manifest>
+diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml
+--- a/build/android/AndroidManifest.xml
++++ b/build/android/AndroidManifest.xml
+@@ -15,6 +15,6 @@
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="org.dummy">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
+ 
+ </manifest>
+diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.jinja
+--- a/build/android/gradle/android.jinja
++++ b/build/android/gradle/android.jinja
+@@ -52,7 +52,7 @@ android {
+ 
+     defaultConfig {
+         vectorDrawables.useSupportLibrary = true
+-        minSdkVersion 19
++        minSdkVersion 16
+         targetSdkVersion {{ target_sdk_version }}
+     }
+ 
+diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+--- a/chrome/android/BUILD.gn
++++ b/chrome/android/BUILD.gn
+@@ -63,7 +63,7 @@ jinja_template("chrome_public_android_manifest") {
+   output = chrome_public_android_manifest
+   variables = chrome_public_jinja_variables
+   variables += [
+-    "min_sdk_version=19",
++    "min_sdk_version=16",
+     "target_sdk_version=$android_sdk_version",
+   ]
+ }
+@@ -1459,7 +1459,7 @@ template("chrome_public_apk_or_module_tmpl") {
+       android_manifest = chrome_modern_public_android_manifest
+       android_manifest_dep = ":chrome_modern_public_android_manifest"
+     } else {
+-      min_sdk_version = 19
++      min_sdk_version = 16
+       android_manifest = chrome_public_android_manifest
+       android_manifest_dep = ":chrome_public_android_manifest"
+     }
+@@ -1663,7 +1663,7 @@ jinja_template("chrome_public_test_apk_manifest") {
+   variables = default_chrome_public_jinja_variables
+   variables += [
+     "manifest_package=$test_manifest_package",
+-    "min_sdk_version=19",
++    "min_sdk_version=16",
+     "target_sdk_version=$android_sdk_version",
+   ]
+ }
+@@ -1674,7 +1674,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
+   output = chrome_public_test_vr_apk_manifest
+   variables = chrome_public_jinja_variables
+   variables += [
+-    "min_sdk_version=19",
++    "min_sdk_version=16",
+     "target_sdk_version=$android_sdk_version",
+   ]
+ }
+diff --git a/chrome/android/java/res/layout/autofill_local_card_editor.xml b/chrome/android/java/res/layout/autofill_local_card_editor.xml
+--- a/chrome/android/java/res/layout/autofill_local_card_editor.xml
++++ b/chrome/android/java/res/layout/autofill_local_card_editor.xml
+@@ -19,7 +19,7 @@
+ 
+         <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
+         <EditText
+-            tools:ignore="Autofill,LabelFor"
++            tools:ignore="Autofill"
+             android:id="@+id/credit_card_name_edit"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+@@ -40,7 +40,7 @@
+ 
+         <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
+         <EditText
+-            tools:ignore="Autofill,LabelFor"
++            tools:ignore="Autofill"
+             android:id="@+id/credit_card_number_edit"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+diff --git a/chrome/test/android/chrome_public_test_support/AndroidManifest.xml b/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
+--- a/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
++++ b/chrome/test/android/chrome_public_test_support/AndroidManifest.xml
+@@ -5,7 +5,7 @@
+   <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       package="org.chromium.chrome.tests.support">
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="22" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
+     <uses-permission android:name="android.permission.INTERNET" />
+     <application>
+         <service android:name="org.chromium.chrome.browser.media.TestMediaRouteProviderService"
+diff --git a/components/cronet/android/sample/AndroidManifest.xml b/components/cronet/android/sample/AndroidManifest.xml
+--- a/components/cronet/android/sample/AndroidManifest.xml
++++ b/components/cronet/android/sample/AndroidManifest.xml
+@@ -9,8 +9,7 @@
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="org.chromium.cronet_sample_apk">
+ 
+-    <!-- //components/cronet still needs to support Jelly Bean. See crbug.com/922656 -->
+-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.INTERNET"/>
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+     <application android:name="CronetSampleApplication"
+diff --git a/components/cronet/android/sample/javatests/AndroidManifest.xml b/components/cronet/android/sample/javatests/AndroidManifest.xml
+--- a/components/cronet/android/sample/javatests/AndroidManifest.xml
++++ b/components/cronet/android/sample/javatests/AndroidManifest.xml
+@@ -8,8 +8,7 @@
+        doesn't ignore this. -->
+   <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+       package="org.chromium.cronet_sample_apk.tests">
+-    <!-- //components/cronet still needs to support Jelly Bean. See crbug.com/922656 -->
+-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+     <!-- We add an application tag here just so that we can indicate that this
+          package needs to link against the android.test library, which is
+diff --git a/components/cronet/android/test/javaperftests/AndroidManifest.xml b/components/cronet/android/test/javaperftests/AndroidManifest.xml
+--- a/components/cronet/android/test/javaperftests/AndroidManifest.xml
++++ b/components/cronet/android/test/javaperftests/AndroidManifest.xml
+@@ -1,8 +1,7 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+       package="org.chromium.net">
+-    <!-- //components/cronet still needs to support Jelly Bean. See crbug.com/922656 -->
+-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.INTERNET"/>
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+diff --git a/components/cronet/android/test/javatests/AndroidManifest.xml b/components/cronet/android/test/javatests/AndroidManifest.xml
+--- a/components/cronet/android/test/javatests/AndroidManifest.xml
++++ b/components/cronet/android/test/javatests/AndroidManifest.xml
+@@ -8,8 +8,7 @@
+        doesn't ignore this. -->
+   <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+       package="org.chromium.net.tests">
+-    <!-- //components/cronet still needs to support Jelly Bean. See crbug.com/922656 -->
+-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
++    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+     <!-- We add an application tag here just so that we can indicate that this
+          package needs to link against the android.test library, which is
+diff --git a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2 b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
+--- a/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
++++ b/components/test/android/browsertests_apk/AndroidManifest.xml.jinja2
+@@ -9,7 +9,7 @@
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="org.chromium.components_browsertests_apk">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+     <uses-permission android:name="android.permission.CAMERA" />
+diff --git a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2 b/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2
+--- a/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2
++++ b/content/shell/android/browsertests_apk/AndroidManifest.xml.jinja2
+@@ -9,7 +9,7 @@
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="org.chromium.content_browsertests_apk">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+     <uses-permission android:name="android.permission.CAMERA" />
+diff --git a/content/shell/android/javatests/AndroidManifest.xml b/content/shell/android/javatests/AndroidManifest.xml
+--- a/content/shell/android/javatests/AndroidManifest.xml
++++ b/content/shell/android/javatests/AndroidManifest.xml
+@@ -6,7 +6,7 @@
+        doesn't ignore this. -->
+   <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+       package="org.chromium.content_shell_apk.tests">
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+     <!-- We add an application tag here just so that we can indicate that this
+          package needs to link against the android.test library, which is
+diff --git a/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2 b/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2
+--- a/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2
++++ b/content/shell/android/linker_test_apk/AndroidManifest.xml.jinja2
+@@ -9,7 +9,7 @@
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="org.chromium.chromium_linker_test_apk">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+     <uses-permission android:name="android.permission.CAMERA" />
+diff --git a/content/shell/android/shell_apk/AndroidManifest.xml.jinja2 b/content/shell/android/shell_apk/AndroidManifest.xml.jinja2
+--- a/content/shell/android/shell_apk/AndroidManifest.xml.jinja2
++++ b/content/shell/android/shell_apk/AndroidManifest.xml.jinja2
+@@ -9,7 +9,7 @@
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="org.chromium.content_shell_apk">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+     <uses-permission android:name="android.permission.CAMERA"/>
+diff --git a/docs/android_build_instructions.md b/docs/android_build_instructions.md
+--- a/docs/android_build_instructions.md
++++ b/docs/android_build_instructions.md
+@@ -162,7 +162,7 @@ the version of Android running on a device. Chrome uses this feature to target
+ 3 different versions using 3 different ninja targets:
+ 
+ 1. `chrome_public_apk` (ChromePublic.apk)
+-   * `minSdkVersion=19` (KitKat).
++   * `minSdkVersion=16` (Jelly Bean).
+    * Stores libchrome.so compressed within the APK.
+    * Uses [Crazy Linker](https://cs.chromium.org/chromium/src/base/android/linker/BUILD.gn?rcl=6bb29391a86f2be58c626170156cbfaa2cbc5c91&l=9).
+    * Shipped only for Android < 21, but still works fine on Android >= 21.
+diff --git a/mojo/public/java/system/javatests/AndroidManifest.xml b/mojo/public/java/system/javatests/AndroidManifest.xml
+--- a/mojo/public/java/system/javatests/AndroidManifest.xml
++++ b/mojo/public/java/system/javatests/AndroidManifest.xml
+@@ -8,7 +8,7 @@
+       xmlns:tools="http://schemas.android.com/tools"
+       package="org.chromium.mojo.tests">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21" />
++    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
+ 
+     <uses-permission android:name="android.permission.INJECT_EVENTS"
+         tools:ignore="ProtectedPermissions"/>
+diff --git a/net/android/unittest_support/AndroidManifest.xml b/net/android/unittest_support/AndroidManifest.xml
+--- a/net/android/unittest_support/AndroidManifest.xml
++++ b/net/android/unittest_support/AndroidManifest.xml
+@@ -10,7 +10,7 @@ found in the LICENSE file.
+       android:versionCode="1"
+       android:versionName="1.0">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+     <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
+diff --git a/net/test/android/javatests/AndroidManifest.xml b/net/test/android/javatests/AndroidManifest.xml
+--- a/net/test/android/javatests/AndroidManifest.xml
++++ b/net/test/android/javatests/AndroidManifest.xml
+@@ -8,7 +8,7 @@
+     xmlns:tools="http://schemas.android.com/tools"
+     package="org.chromium.net.test.support">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+     <uses-permission android:name="android.permission.INTERNET"/>
+ 
+diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/java/AndroidManifest.xml.jinja2
+--- a/remoting/android/java/AndroidManifest.xml.jinja2
++++ b/remoting/android/java/AndroidManifest.xml.jinja2
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+         package="{{ APK_PACKAGE_NAME }}">
+-    <uses-sdk android:minSdkVersion="19"
++    <uses-sdk android:minSdkVersion="14"
+             android:targetSdkVersion="28"/>
+     <uses-permission android:name="android.permission.INTERNET"/>
+     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+diff --git a/remoting/android/javatests/AndroidManifest.xml.jinja2 b/remoting/android/javatests/AndroidManifest.xml.jinja2
+--- a/remoting/android/javatests/AndroidManifest.xml.jinja2
++++ b/remoting/android/javatests/AndroidManifest.xml.jinja2
+@@ -11,7 +11,7 @@
+     <!-- We add an application tag here just so that we can indicate that this
+          package needs to link against the android.test library, which is
+          needed when building test cases. -->
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.RUN_INSTRUMENTATION" />
+     <application>
+         <uses-library android:name="android.test.runner" />
+diff --git a/testing/android/driver/java/AndroidManifest.xml b/testing/android/driver/java/AndroidManifest.xml
+--- a/testing/android/driver/java/AndroidManifest.xml
++++ b/testing/android/driver/java/AndroidManifest.xml
+@@ -10,7 +10,7 @@ found in the LICENSE file.
+       android:versionCode="1"
+       android:versionName="1.0">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+ 
+     <application android:label="OnDeviceInstrumentationDriver" />
+diff --git a/testing/android/native_test/java/AndroidManifest.xml.jinja2 b/testing/android/native_test/java/AndroidManifest.xml.jinja2
+--- a/testing/android/native_test/java/AndroidManifest.xml.jinja2
++++ b/testing/android/native_test/java/AndroidManifest.xml.jinja2
+@@ -10,7 +10,7 @@ found in the LICENSE file.
+       android:versionCode="1"
+       android:versionName="1.0">
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+     <uses-permission android:name="android.permission.BLUETOOTH"/>
+     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+diff --git a/tools/android/audio_focus_grabber/java/AndroidManifest.xml b/tools/android/audio_focus_grabber/java/AndroidManifest.xml
+--- a/tools/android/audio_focus_grabber/java/AndroidManifest.xml
++++ b/tools/android/audio_focus_grabber/java/AndroidManifest.xml
+@@ -8,7 +8,7 @@
+ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="org.chromium.tools.audio_focus_grabber" >
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+ 
+     <application
+         android:label="@string/app_name" >
+diff --git a/tools/android/push_apps_to_background/AndroidManifest.xml b/tools/android/push_apps_to_background/AndroidManifest.xml
+--- a/tools/android/push_apps_to_background/AndroidManifest.xml
++++ b/tools/android/push_apps_to_background/AndroidManifest.xml
+@@ -10,7 +10,7 @@
+     android:versionCode="1"
+     android:versionName="1.0" >
+ 
+-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
++    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+ 
+     <application
+         android:icon="@drawable/ic_launcher"
+-- 
+2.11.0
+

build/patches/ungoogled-chromium-disable-safe-browsing.patch

@@ -41,7 +41,7 @@ Subject: ungoogled-chromium: disable safe browsing
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2647,8 +2647,6 @@ jumbo_split_static_library("browser") {
+@@ -2649,8 +2649,6 @@ jumbo_split_static_library("browser") {
        "download/download_commands.h",
        "download/download_crx_util.cc",
        "download/download_crx_util.h",

build/patches_list.txt

@@ -52,6 +52,7 @@ Fix-crash-when-accessing-page-info-site-settings.patch
 openH264-enable-ARM-ARM64-optimizations.patch
 Switch-to-fstack-protector-strong.patch
 Enable-fwrapv-in-Clang-for-non-UBSan-builds.patch
+AV1-codec-support.patch
 Inject-scripts-for-AMP-tracking-ads-and-video-functionality.patch
 Allow-playing-audio-in-background.patch
 Add-flag-to-control-video-playback-resume-feature.patch
@@ -107,3 +108,4 @@ Add-flag-to-disable-IPv6-probes.patch
 Add-a-proxy-configuration-page.patch
 Do-not-ignore-download-location-prompt-setting.patch
 Disable-previews-by-default.patch
+Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch