Skip to content

Commit

Permalink
Added missing dependency.
Browse files Browse the repository at this point in the history
chrome/app/BUILD.gn's target generated_resources generates
grit/generated_resources.h which we overwrite via chromium_src
and include brave/grit/brave_generated_resources.h. We need
to make sure that that header exists, so generated_resources
target needs to depend on //brave/app:brave_generated_resources_grit.
  • Loading branch information
mkarolin committed Apr 4, 2019
1 parent 15ebcbe commit 147313e
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions patches/chrome-app-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 8670f53f406ec4fbc41f7e35667fa0f73f6037cb..5547f4533046725932967cba9eb6519cb6d2e7c9 100644
index 8670f53f406ec4fbc41f7e35667fa0f73f6037cb..8fd6ea8f18195c3730096a493fd01498222500d1 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -259,7 +259,7 @@ grit("google_chrome_strings") {
@@ -182,6 +182,10 @@ grit("generated_resources") {
if (is_android) {
outputs += android_generated_java_resources
}
+
+ deps = [
+ "//brave/app:brave_generated_resources_grit",
+ ]
}

if (is_android) {
@@ -259,7 +263,7 @@ grit("google_chrome_strings") {
}

grit("chromium_strings") {
Expand All @@ -11,7 +22,7 @@ index 8670f53f406ec4fbc41f7e35667fa0f73f6037cb..5547f4533046725932967cba9eb6519c
defines = chrome_grit_defines
output_dir = "$root_gen_dir/chrome"
outputs = [
@@ -344,6 +344,7 @@ static_library("test_support") {
@@ -344,6 +348,7 @@ static_library("test_support") {
"//components/nacl/common:buildflags",
"//components/startup_metric_utils/browser:lib",
"//components/tracing",
Expand Down

0 comments on commit 147313e

Please sign in to comment.