Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified output name for linux build to 'brave' #2

Closed
wants to merge 1 commit into from
+19 −1
Closed

Modified output name for linux build to 'brave' #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion patches/master_patch.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,18 @@ index 93a04ceb27d04671efddc245fc4e57ec388112da..683d6dce475462785fd365e373ca090d
r'C:\Program Files (x86)\Microsoft Visual Studio\2017\Community'):
if path and os.path.exists(path):
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index cf36e40ee5426464cee670a11128a0e11ca49efd..1ddd819e9f7fc33515281035ce6488a0813b36a1 100644
index cf36e40ee5426464cee670a11128a0e11ca49efd..7bfdc06edc046a60a587a6c41647a29992cab46c 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -52,7 +52,7 @@ if (is_win) {
"$root_out_dir/initialexe/chrome.exe",
]
outputs = [
- "$root_out_dir/chrome.exe",
+ "$root_out_dir/brave.exe",
]
if (symbol_level != 0) {
outputs += [ "$root_out_dir/chrome.exe.pdb" ]
@@ -253,6 +253,8 @@ if (!is_android && !is_mac) {
"app/chrome_main.cc",
"app/chrome_main_delegate.cc",
Expand All @@ -34,6 +43,15 @@ index cf36e40ee5426464cee670a11128a0e11ca49efd..1ddd819e9f7fc33515281035ce6488a0
]

deps += [
@@ -325,7 +327,7 @@ if (!is_android && !is_mac) {
if (is_win) {
output_name = "initialexe/chrome"
} else {
- output_name = "chrome"
+ output_name = "brave"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we also need to update chrome_binary = "$root_out_dir/chrome" in linux_symbols or official builds with symbols stripped will fail

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, while trying to build with npm run build -- --debug_build=true --official_build=true I had an error

ERROR Input to target not generated by a dependency.
The file:
  //out/Release/chrome
is listed as an input or source for the target:
  //chrome:linux_symbols
but no targets in the build generate that file.

fixed in in a new branch and new PR, https://github.com/brave/antimuon/tree/build-linux-output-name2, #3, because I could not build it in original PR branch build-linux-output-name.

}

sources = []
@@ -375,6 +377,8 @@ if (is_win) {
"app/chrome_main.cc",
"app/chrome_main_delegate.cc",
Expand Down