-
Notifications
You must be signed in to change notification settings - Fork 899
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #304 from brave/fix_linux_build_error
Fix linux build error
- Loading branch information
Showing
6 changed files
with
42 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn | ||
index 9a21e268447a0ea984101132329073dca486f6ad..a916c8e70e8f19a52f2a0993fc78712f8cb15778 100644 | ||
--- a/chrome/common/BUILD.gn | ||
+++ b/chrome/common/BUILD.gn | ||
@@ -77,6 +77,7 @@ source_set("channel_info") { | ||
if (is_android) { | ||
public_deps += [ "//components/version_info/android:channel_getter" ] | ||
} | ||
+ if (brave_chromium_build) { deps = [ "//brave/common:channel_info" ] } | ||
} | ||
|
||
source_set("ini_parser") { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn | ||
index c06139016ea7e4228c7442f4a1bd0ce0fc7c79bc..3b45fd207ba726dd6f1a23ac3992c83f6cf188e7 100644 | ||
--- a/components/omnibox/browser/BUILD.gn | ||
+++ b/components/omnibox/browser/BUILD.gn | ||
@@ -194,6 +194,7 @@ static_library("browser") { | ||
"//ui/gfx", | ||
"//url", | ||
] | ||
+ if (brave_chromium_build) { deps += [ "//brave/components/omnibox/browser" ] } | ||
|
||
if ((!is_android || enable_vr) && !is_ios) { | ||
sources += get_target_outputs(":omnibox_vector_icons") |