-
Notifications
You must be signed in to change notification settings - Fork 274
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 a sub-project for the common sources. #1155
Draft
prbprbprb
wants to merge
9
commits into
google:master
Choose a base branch
from
prbprbprb:common
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Commits on Oct 26, 2023
-
Add a sub-project for the common sources.
Puts the common sources in an explicit Gradle sub-project rather than just referring to them from multiple sourceSets. Pro: Project now loads cleanly in Studio with no duplicate source root warnings and Studio can follow cross-refs between all sub-projects. Pro: Also tidied up the dependencies to the constants build. Hopefully we can now tidy that build up further. Con: Had to add a whole new set of stubs (platform-stub) for Platform.java due to circular dependency... All of the code in common/ expects to be compiled against the current platform's Platform.java but all of the Platform.java's also expect to be compiled against the common code. Pro: Adding platform-stub allows us to remove the platformJar stuff from the OpenJDK build. Turns out this was just a hack to allow android-platform to build on OpenJDK so compiling against a stub is cleaner. Con: the common build's processTestResources task seems to try and copy all the resources twice causing an error. Added a hacky workaround for now. Major con: The AARs built by the Android build do not contain classes from the common sources. I've tried multiple ways of expressing the dependency and got nowhere so advice would be appreciated.
Configuration menu - View commit details
-
Copy full SHA for eed81ae - Browse repository at this point
Copy the full SHA eed81aeView commit details -
Configuration menu - View commit details
-
Copy full SHA for ffd0d0c - Browse repository at this point
Copy the full SHA ffd0d0cView commit details -
Still various Javadoc issues remain but they existed before this PR.
Configuration menu - View commit details
-
Copy full SHA for 1546bd0 - Browse repository at this point
Copy the full SHA 1546bd0View commit details -
Configuration menu - View commit details
-
Copy full SHA for b01d229 - Browse repository at this point
Copy the full SHA b01d229View commit details -
Remove extraneous cmake version.
When specified in a defaultConfig block it ends up setting the module version too.....
Configuration menu - View commit details
-
Copy full SHA for c9e1039 - Browse repository at this point
Copy the full SHA c9e1039View commit details -
Configuration menu - View commit details
-
Copy full SHA for fd35a0e - Browse repository at this point
Copy the full SHA fd35a0eView commit details
Commits on Jan 9, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 16ce8d2 - Browse repository at this point
Copy the full SHA 16ce8d2View commit details -
Was using a no-longer-needed 3P plugin which doesn't work correctly with the latest AGP. Now is at least publishing an AAR even though it doesn't contain the common classes.
Configuration menu - View commit details
-
Copy full SHA for de6a78d - Browse repository at this point
Copy the full SHA de6a78dView commit details -
Publish all classes for Android builds.
1. Remove the implementation dependency from :conscrypt-android to :conscrypt-common as that ends up exposing conscrypt-common as a dependency in the POM file. 2. Just copy the actual class files from the :conscrypt-common output into the :conscrypt-android build directory before the AAR is built.
Configuration menu - View commit details
-
Copy full SHA for c9ed33e - Browse repository at this point
Copy the full SHA c9ed33eView commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.