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 Cronet to main build #6132

Merged
merged 5 commits into from Jan 9, 2020
Merged

Conversation

ejona86
Copy link
Member

@ejona86 ejona86 commented Sep 7, 2019

This is a draft as the CI still needs to be adjusted and at will cause merge conflicts with #6130. I'm sending this out now so that it is more clear what #6131 permits. Note that this includes #6131, so much of it is noise; just look at the last commit.

@ejona86 ejona86 marked this pull request as ready for review January 7, 2020 15:33
Copy link
Contributor

@voidzcy voidzcy left a comment

Choose a reason for hiding this comment

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

Could we make the same change (not in this PR) to grpc-android?

build.gradle Outdated
@@ -208,6 +212,22 @@ subprojects {
}
}

if (rootProject.properties.get('errorProne', true)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

The indentation of this block may need to be fixed.

Copy link
Member

@dapengzhang0 dapengzhang0 left a comment

Choose a reason for hiding this comment

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

LGTM

@ejona86
Copy link
Member Author

ejona86 commented Jan 9, 2020

We should do this same thing for grpc-android and grpc-android-interop-testing (potentially removing the useless parent project that exists there today; "inline" app). But I was happy just doing one for now and seeing how well it went.

@@ -11,6 +11,11 @@ developers don't have C compilers installed and don't need to run or modify the
codegen, the build can skip it. To skip, create the file
`<project-root>/gradle.properties` and add `skipCodegen=true`.

Some parts of grpc-java depend on Android. Since many Java developers don't have
the Android SDK installed and don't need to run or modify the Android
Copy link
Contributor

Choose a reason for hiding this comment

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

Are there instructions to install the Android SDK in case someone doesn't want to "skipAndroid"?

Copy link
Member Author

Choose a reason for hiding this comment

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

It is basically download the SDK and set $ANDROID_HOME. But there's some complications that make it hard to be concise. I think I'll let @dapengzhang0 or @voidzcy add a documentation section later in this document, but after this is merged.

(Among the problems: ANDROID_HOME is actually deprecated now in favor of ANDROID_SDK_HOME, but we'd need to upgrade to a newer gradle plugin for ANDROID_SDK _HOME to work)

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure. It's in #6593.

@ejona86 ejona86 merged commit 8cf0196 into grpc:master Jan 9, 2020
@ejona86 ejona86 deleted the integrate-cronet-in-build branch January 9, 2020 23:20
@lock lock bot locked as resolved and limited conversation to collaborators Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants