From dea4b4ae573d8ea61023cebe1ca3ef09e201ab24 Mon Sep 17 00:00:00 2001
From: Gyuyoung Kim <gyuyoung@igalia.com>
Date: Tue, 25 Aug 2020 16:20:16 +0900
Subject: [PATCH] Fix deps in //brave/renderer

Resolves brave/brave-browser#10632.
---
 build/config/brave_build.gni           |  1 +
 patches/chrome-renderer-BUILD.gn.patch | 16 ++++++++--------
 renderer/BUILD.gn                      | 12 ++----------
 renderer/sources.gni                   | 13 +++++++++++++
 4 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 renderer/sources.gni

diff --git a/build/config/brave_build.gni b/build/config/brave_build.gni
index f46b322201e..163e9148ec8 100644
--- a/build/config/brave_build.gni
+++ b/build/config/brave_build.gni
@@ -9,4 +9,5 @@ import("//brave/components/sync/sources.gni")
 import("//brave/components/sync/driver/sources.gni")
 import("//brave/installer/linux/sources.gni")
 import("//brave/net/sources.gni")
+import("//brave/renderer/sources.gni")
 import("//brave/third_party/blink/renderer/includes.gni")
diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch
index f1dda8349f3..1156167af11 100644
--- a/patches/chrome-renderer-BUILD.gn.patch
+++ b/patches/chrome-renderer-BUILD.gn.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
-index cbf9a60c385e47199879839f87c68df637494b69..eae4ed6d2364b926726d767280e74b29910f4389 100644
+index cbf9a60c385e47199879839f87c68df637494b69..ec8d1c45f64bd51958998ba35691d22ff3cc6fbe 100644
 --- a/chrome/renderer/BUILD.gn
 +++ b/chrome/renderer/BUILD.gn
-@@ -134,6 +134,7 @@ static_library("renderer") {
-   public_deps = [ "//components/contextual_search:buildflags" ]
+@@ -195,6 +195,7 @@ static_library("renderer") {
+     "//v8",
+   ]
  
-   deps = [
-+    "//brave/renderer",
-     "//chrome:resources",
-     "//chrome:strings",
-     "//chrome/common",
++  sources += brave_chrome_renderer_sources public_deps += brave_chrome_renderer_public_deps
+   data_deps = [ "//tools/v8_context_snapshot" ]
+ 
+   configs += [ "//build/config/compiler:wexit_time_destructors" ]
diff --git a/renderer/BUILD.gn b/renderer/BUILD.gn
index 74bcb90638f..40e8d9b4f94 100644
--- a/renderer/BUILD.gn
+++ b/renderer/BUILD.gn
@@ -1,8 +1,6 @@
 import("//build/config/features.gni")
 
 source_set("renderer") {
-  # Remove when https://github.com/brave/brave-browser/issues/10632 is resolved
-  check_includes = false
   visibility = [
     "//chrome/renderer/*",
     "//brave/renderer/*",
@@ -10,13 +8,7 @@ source_set("renderer") {
     "//brave/test:*"
   ]
 
-  sources = [
-    "brave_content_renderer_client.cc",
-    "brave_content_renderer_client.h",
-  ]
-
-  deps = [
-    "//brave/components/content_settings/renderer",
-    "//third_party/blink/public:blink",
+  public_deps = [
+   "//chrome/renderer",
   ]
 }
diff --git a/renderer/sources.gni b/renderer/sources.gni
new file mode 100644
index 00000000000..00cb3d91dd1
--- /dev/null
+++ b/renderer/sources.gni
@@ -0,0 +1,13 @@
+# Copyright (c) 2020 The Brave Authors. All rights reserved.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+brave_chrome_renderer_sources = [
+  "//brave/renderer/brave_content_renderer_client.cc",
+  "//brave/renderer/brave_content_renderer_client.h",
+]
+brave_chrome_renderer_public_deps = [
+  "//brave/components/content_settings/renderer",
+  "//third_party/blink/public:blink"
+]