From 151bbd4635b33fc050ae577bf704e2322683fa25 Mon Sep 17 00:00:00 2001
From: Jocelyn Liu <yrliou@gmail.com>
Date: Thu, 17 Oct 2019 15:37:31 -0700
Subject: [PATCH] include brave's AndroidManifest.xml to be extensible

---
 android/java/AndroidManifest.xml              |  6 +++++
 build/android/config.gni                      |  6 +++++
 patches/chrome-android-BUILD.gn.patch         | 24 +++++++++++++++----
 ...ome-android-java-AndroidManifest.xml.patch | 18 +++++++-------
 4 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 android/java/AndroidManifest.xml

diff --git a/android/java/AndroidManifest.xml b/android/java/AndroidManifest.xml
new file mode 100644
index 00000000000..a4b4107425e
--- /dev/null
+++ b/android/java/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<receiver android:name="org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService"
+    android:exported="false">
+    <intent-filter>
+          <action android:name="DEEP_LINK"/>
+    </intent-filter>
+</receiver>
diff --git a/build/android/config.gni b/build/android/config.gni
index 8e8a85ad1e0..507b9692a83 100644
--- a/build/android/config.gni
+++ b/build/android/config.gni
@@ -1 +1,7 @@
 import("//brave/android/brave_java_sources.gni")
+
+declare_args() {
+  brave_android_manifest_includes = []
+}
+
+brave_android_manifest_includes = [ "//brave/android/java/AndroidManifest.xml" ]
diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch
index 58926ca2f7c..38b9c401292 100644
--- a/patches/chrome-android-BUILD.gn.patch
+++ b/patches/chrome-android-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a27ba353d 100644
+index 91716bcfcd80cd3f3f576a10227e47caccc89b28..7617b0236050d55182daeda678ed8dcf2cf253b8 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -32,7 +32,7 @@ import("java_sources.gni")
@@ -11,7 +11,23 @@ index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a
  chrome_public_test_manifest_package = "org.chromium.chrome.tests"
  
  chrome_public_jinja_variables =
-@@ -101,6 +101,7 @@ android_resources("chrome_app_java_resources") {
+@@ -58,6 +58,7 @@ chrome_jni_registration_header =
+ chrome_jni_for_test_registration_header = "$root_build_dir/gen/chrome/browser/android/chrome_jni_for_test_registration.h"
+ 
+ jinja_template("chrome_public_android_manifest") {
++  includes = brave_android_manifest_includes
+   input = "java/AndroidManifest.xml"
+   output = chrome_public_android_manifest
+   variables = chrome_public_jinja_variables
+@@ -68,6 +69,7 @@ jinja_template("chrome_public_android_manifest") {
+ }
+ 
+ jinja_template("chrome_modern_public_android_manifest") {
++  includes = brave_android_manifest_includes
+   input = "java/AndroidManifest.xml"
+   output = chrome_modern_public_android_manifest
+   variables = chrome_public_jinja_variables
+@@ -101,6 +103,7 @@ android_resources("chrome_app_java_resources") {
    deps = [
      ":chrome_strings_grd",
      ":ui_locale_string_resources",
@@ -19,7 +35,7 @@ index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a
      "//chrome/android/webapk/libs/common:splash_resources",
      "//chrome/app:java_strings_grd",
      "//chrome/browser/ui/android/widget:ui_widget_java_resources",
-@@ -543,6 +544,7 @@ java_group("chrome_all_java") {
+@@ -543,6 +546,7 @@ java_group("chrome_all_java") {
  group("jni_headers") {
    public_deps = [
      ":chrome_jni_headers",
@@ -27,7 +43,7 @@ index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a
      "//chrome/android/features/autofill_assistant:jni_headers",
      "//chrome/android/features/keyboard_accessory:jni_headers",
      "//chrome/android/features/media_router:jni_headers",
-@@ -1422,6 +1424,7 @@ if (current_toolchain == default_toolchain) {
+@@ -1422,6 +1426,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]
diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch
index 658b14674c5..2a21af00c08 100644
--- a/patches/chrome-android-java-AndroidManifest.xml.patch
+++ b/patches/chrome-android-java-AndroidManifest.xml.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index 9f95291191e896e0ce9691941fc0fa8d5323a1ed..d736f9d7f0b6014c4d8cfb07928f94664061688c 100644
+index 9f95291191e896e0ce9691941fc0fa8d5323a1ed..b1729b5a3f5ffe8c8a871a766a325ca485f15240 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -1097,6 +1097,7 @@ by a child template that "extends" this file.
-                <category android:name="{{ manifest_package }}"/>
-             </intent-filter>
-         </receiver>
-+        <receiver android:name="org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService" android:exported="false"><intent-filter><action android:name="DEEP_LINK"/></intent-filter></receiver>
-         <!-- GcmTaskService for registration for Invalidations. -->
-         <service android:name="com.google.ipc.invalidation.ticl.android2.channel.GcmRegistrationTaskService"
-             android:exported="true"
+@@ -1344,6 +1344,7 @@ android:value="true" />
+         </activity>
+         {% endif %}
+ 
++        {% include "//brave/android/java/AndroidManifest.xml" %}
+         {% block extra_application_definitions %}
+ 
+         <!-- Media route controllers to use for remote playback (cast).