From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: fgei <fgei@gmail.com>
Date: Mon, 13 Mar 2023 08:41:43 +0000
Subject: [PATCH] Consolidate downstream changes in dependencies, sources for
 chrome layer

---
 chrome/android/BUILD.gn                      | 10 ++++++++++
 chrome/android/chrome_ext_deps.gni           |  9 +++++++++
 chrome/android/chrome_ext_java_resources.gni |  6 ++++++
 chrome/android/chrome_ext_java_sources.gni   |  6 ++++++
 chrome/android/chrome_java_resources.gni     |  2 ++
 chrome/android/java_sources.gni              |  1 +
 6 files changed, 34 insertions(+)
 create mode 100644 chrome/android/chrome_ext_deps.gni
 create mode 100644 chrome/android/chrome_ext_java_resources.gni
 create mode 100644 chrome/android/chrome_ext_java_sources.gni

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index ef1aa2682cf62..925a133b9726e 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -10,6 +10,9 @@ import("//build/config/cronet/config.gni")
 import("//build/config/python.gni")
 import("//build/util/process_version.gni")
 import("//chrome/android/chrome_common_shared_library.gni")
+import("//chrome/android/chrome_ext_deps.gni")
+import("//chrome/android/chrome_ext_java_sources.gni")
+import("//chrome/android/chrome_ext_java_resources.gni")
 import("//chrome/android/chrome_java_resources.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/android/expectations/expectations.gni")
@@ -196,6 +199,8 @@ if (current_toolchain == default_toolchain) {
 
   android_resources("chrome_app_java_resources") {
     sources = chrome_java_resources
+    # Extension of sources at chrome_app_java_resources
+    sources += chrome_ext_java_resources
     sources += [ "//chrome/android/java/res_app/layout/main.xml" ]
 
     deps = [
@@ -751,6 +756,11 @@ if (current_toolchain == default_toolchain) {
     # From java_sources.gni.
     sources = chrome_java_sources + [ app_hooks_impl ]
 
+    # Extension of sources, deps, and srcjar_deps for chrome_java target
+    sources += chrome_ext_java_sources
+    deps += chrome_ext_deps
+    srcjar_deps += chrome_ext_srcjar_deps
+
     # Include sources from feed_java_sources.gni.
     sources += feed_java_sources
     srcjar_deps += feed_srcjar_deps
diff --git a/chrome/android/chrome_ext_deps.gni b/chrome/android/chrome_ext_deps.gni
new file mode 100644
index 0000000000000..0829b5df7e80d
--- /dev/null
+++ b/chrome/android/chrome_ext_deps.gni
@@ -0,0 +1,9 @@
+# Copyright 2023 GrapheneOS
+# Use of this source code is governed by a GPL-2.0-only-style license that can be
+# found in the LICENSE file.
+
+chrome_ext_deps = [
+]
+
+chrome_ext_srcjar_deps = [
+]
diff --git a/chrome/android/chrome_ext_java_resources.gni b/chrome/android/chrome_ext_java_resources.gni
new file mode 100644
index 0000000000000..4ce3232392871
--- /dev/null
+++ b/chrome/android/chrome_ext_java_resources.gni
@@ -0,0 +1,6 @@
+# Copyright 2023 GrapheneOS
+# Use of this source code is governed by a GPL-2.0-only-style license that can be
+# found in the LICENSE file.
+
+chrome_ext_java_resources = [
+]
diff --git a/chrome/android/chrome_ext_java_sources.gni b/chrome/android/chrome_ext_java_sources.gni
new file mode 100644
index 0000000000000..3342c74236ea9
--- /dev/null
+++ b/chrome/android/chrome_ext_java_sources.gni
@@ -0,0 +1,6 @@
+# Copyright 2023 GrapheneOS
+# Use of this source code is governed by a GPL-2.0-only-style license that can be
+# found in the LICENSE file.
+
+chrome_ext_java_sources = [
+]
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
index cdb3c68a13da9..bccec1b15d097 100644
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -7,6 +7,8 @@
 # (for f in $(find java/res/*/ -type f); do echo '  "'$f'",'; done; echo ']') >> chrome_java_resources.gni
 # git cl format
 
+import ("//chrome/android/chrome_ext_java_resources.gni")
+
 chrome_java_resources = [
   "java/res/anim/accelerate_quart.xml",
   "java/res/anim/activity_close_exit.xml",
diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index a5f30237c3bfa..c363cb05f3619 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
+import("//chrome/android/chrome_ext_java_sources.gni")
 import("//chrome/android/chrome_java_sources.gni")
 import("//chrome/android/chrome_junit_test_java_sources.gni")
 import("//chrome/android/chrome_test_java_sources.gni")