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.

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

Add missing brave_generated_resources_grit deps #2440

Merged
merged 1 commit into from
May 14, 2019

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented May 14, 2019

Fix brave/brave-browser#4428

Submitter Checklist:

Test Plan:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@simonhong simonhong added this to the 0.67.x - Nightly milestone May 14, 2019
@simonhong simonhong requested review from bridiver and bsclifton May 14, 2019 06:13
@simonhong simonhong self-assigned this May 14, 2019
@simonhong simonhong mentioned this pull request May 14, 2019
28 tasks
@mihaiplesa
Copy link
Collaborator

Still seeing the following on Windows in the built PR:

08:08:29  ../../brave/browser/extensions/brave_extension_install_prompt.cc(9,10):  fatal error: 'brave/grit/brave_generated_resources.h' file not found
08:08:29  #include "brave/grit/brave_generated_resources.h"
08:08:29           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
08:08:29  1 error generated.
08:08:29  [17828/37738] CXX obj/apps/apps/app_lifetime_monitor.obj

@simonhong simonhong force-pushed the generate_resource_headers_more_faster branch 2 times, most recently from bd8860a to 3259777 Compare May 14, 2019 10:06
@simonhong simonhong changed the title Generate brave resource headers as fast as possible for brave target Add brave_generated_resources_grit deps to brave/browser:browser_process May 14, 2019
@simonhong simonhong force-pushed the generate_resource_headers_more_faster branch from 3259777 to 9d3b453 Compare May 14, 2019 10:13
@simonhong simonhong changed the title Add brave_generated_resources_grit deps to brave/browser:browser_process Add brave_generated_resources_grit deps properly May 14, 2019
@simonhong simonhong force-pushed the generate_resource_headers_more_faster branch 2 times, most recently from 4485bb5 to 4d2197b Compare May 14, 2019 10:50
@simonhong simonhong changed the title Add brave_generated_resources_grit deps properly Add missing brave_generated_resources_grit deps May 14, 2019
@simonhong simonhong force-pushed the generate_resource_headers_more_faster branch from 4d2197b to 543be3b Compare May 14, 2019 11:23
@bsclifton bsclifton requested a review from petemill May 14, 2019 15:50
@bsclifton
Copy link
Member

@petemill can you check this out? As this is related to #2384

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

Fix should be correct, per discussion with @petemill 😄👍
https://bravesoftware.slack.com/archives/CA5FPHWLF/p1557822903090000

@@ -39,6 +39,12 @@ source_set("net") {
"//net",
]

if (!is_android) {
Copy link
Member

Choose a reason for hiding this comment

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

Can android app not use strings from //brave/app:brave_generated_resources_grit @simonhong @bridiver ? If not, and //brave/browser/net will be used by android build, how do we get those string resources declared for android - do they need to be added separately?

Copy link
Member Author

Choose a reason for hiding this comment

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

@petemill I might be wrong - I referred packed_resources target that is excluded from android.
After searching generated_resources in chrome and brave, I think //brave/app:brave_generated_resources_grit could be in is_android also. @bridiver

Copy link
Collaborator

Choose a reason for hiding this comment

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

a lot of these guards were just to get the build working. I didn't have time to dig into each one so @SergeyZhukovsky is working on fixing actual runtime issues related to these

Copy link
Collaborator

Choose a reason for hiding this comment

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

most likely we need to split these grd file up for things like extensions

Copy link
Collaborator

Choose a reason for hiding this comment

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

@petemill what was the build error on android?

Copy link
Member

@petemill petemill left a comment

Choose a reason for hiding this comment

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

Left a question re: android, but this fixes the missing dependencies at least for desktop builds

@petemill petemill merged commit ae83f60 into master May 14, 2019
@petemill petemill deleted the generate_resource_headers_more_faster branch May 14, 2019 17:25
bsclifton pushed a commit that referenced this pull request May 14, 2019
Add missing brave_generated_resources_grit deps
bsclifton pushed a commit that referenced this pull request May 14, 2019
Add missing brave_generated_resources_grit deps
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure on Builder - 'brave/grit/brave_generated_resources.h' file not found
5 participants