diff --git a/android/java/AndroidManifest_user_permissions.xml b/android/java/AndroidManifest_user_permissions.xml deleted file mode 100644 index 5488fab236b..00000000000 --- a/android/java/AndroidManifest_user_permissions.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/build/android/config.gni b/build/android/config.gni index d3568c68765..102415e4ed5 100644 --- a/build/android/config.gni +++ b/build/android/config.gni @@ -18,7 +18,6 @@ declare_args() { brave_android_manifest_includes = [ "//brave/android/java/AndroidManifest.xml", "//brave/android/java/AndroidManifest_intent_filters.xml", - "//brave/android/java/AndroidManifest_user_permissions.xml", ] brave_chrome_java_deps = [ diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 452f6f31c6c..3d4b52c42c3 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,16 +1,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61e166e7ed 100644 +index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..9e72230a8e6403526f9929e32ed7862899573469 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml -@@ -38,6 +38,7 @@ by a child template that "extends" this file. - - - -+ {% include "//brave/android/java/AndroidManifest_user_permissions.xml" %} - - - -@@ -62,7 +63,9 @@ by a child template that "extends" this file. +@@ -62,7 +62,9 @@ by a child template that "extends" this file. @@ -20,7 +12,13 @@ index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61 -@@ -76,24 +79,32 @@ by a child template that "extends" this file. +@@ -72,28 +74,38 @@ by a child template that "extends" this file. + + + ++ {% if is_desktop_android == "true" %} + ++ {% endif %} {% set enable_screen_capture = enable_screen_capture|default(0) %} {% if enable_screen_capture == "true" %} @@ -54,7 +52,7 @@ index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61 @@ -70,7 +68,7 @@ index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61 -@@ -169,7 +182,9 @@ by a child template that "extends" this file. +@@ -169,7 +183,9 @@ by a child template that "extends" this file. @@ -80,7 +78,7 @@ index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61 -@@ -385,6 +400,7 @@ by a child template that "extends" this file. +@@ -385,6 +401,7 @@ by a child template that "extends" this file. @@ -88,7 +86,7 @@ index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61 -@@ -942,6 +958,7 @@ by a child template that "extends" this file. +@@ -942,6 +959,7 @@ by a child template that "extends" this file. @@ -96,7 +94,7 @@ index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61 @@ -104,7 +102,7 @@ index 5270a95ee7b87aacdcad1f2823fe1d20e66cef3b..7d7b4021ff6ced3229306cc4fa4aee61 {% endif %}