Skip to content
New issue

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

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

Already on GitHub? # to your account

Android releases now build directly in android-lantern #130

Merged
merged 3 commits into from
Jun 9, 2021
Merged

Conversation

oxtoacart
Copy link

For getlantern/lantern-internal#4878.

Depends on getlantern/flashlight#1110

@oxtoacart oxtoacart requested a review from atavism June 7, 2021 01:48
@atavism atavism self-assigned this Jun 7, 2021
@@ -13,6 +13,10 @@ This project uses some shared code from a submodule that needs to be initialized

`git submodule update --init`

## Protocol Buffers
If you update the protocol buffer definitions in protos_shared, make sure to run `make protos` to
update the generated dart code.
Copy link
Contributor

@atavism atavism Jun 8, 2021

Choose a reason for hiding this comment

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

It's not necessary for this PR, but could you also just have Make itself rebuild the generated dart code whenever it detects any of the protocol definition files in protos_shared have changed (while building Lantern)? Then we wouldn't have to remember to run this?

Copy link
Author

Choose a reason for hiding this comment

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

I'll make the debug APK depend on that. I think release shouldn't, because that could cause us to use different compiled protos in release than what we tested with. Does that sound good?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep sounds great! Thanks, @oxtoacart

Copy link
Author

Choose a reason for hiding this comment

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

This is done.

@oxtoacart
Copy link
Author

@atavism Are you okay with me merging this or is there still some other stuff you want to look at?

@atavism
Copy link
Contributor

atavism commented Jun 9, 2021

Fine to merge, @oxtoacart!

@atavism atavism merged commit b8027a3 into master Jun 9, 2021
@oxtoacart oxtoacart deleted the ox/issue4878 branch June 9, 2021 19:22
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants