-
Notifications
You must be signed in to change notification settings - Fork 131
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
[Deps] Bump gl native 10.4.0 beta.2 #1175
Conversation
9f50a1c
to
1d3d338
Compare
@@ -58,7 +58,6 @@ android { | |||
if (buildFromSource.toBoolean()) { | |||
jniLibs.pickFirsts.add("**/libc++_shared.so") | |||
} | |||
jniLibs.pickFirsts.add("**/libmapbox-common.so") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We still need it when build from source
@@ -35,7 +35,6 @@ android { | |||
if (buildFromSource.toBoolean()) { | |||
jniLibs.pickFirsts.add("**/libc++_shared.so") | |||
} | |||
jniLibs.pickFirsts.add("**/libmapbox-common.so") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same here
@@ -35,7 +35,6 @@ android { | |||
if (buildFromSource.toBoolean()) { | |||
jniLibs.pickFirsts.add("**/libc++_shared.so") | |||
} | |||
jniLibs.pickFirsts.add("**/libmapbox-common.so") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The same here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes correct, and since gl-native exclude common.so
as well, we don't need this here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the common.so could be duplicated when building from source, and it was
if (buildFromSource.toBoolean()) {
packagingOptions {
pickFirst("**/libc++_shared.so")
pickFirst("**/libmapbox-common.so")
}
}
}
before the v10.4.0-beta.1 bump, we should probably move jniLibs.pickFirsts.add("**/libmapbox-common.so")
to the if (buildFromSource.toBoolean())
closure.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pengdev as I've described here those conditions were related to an issue in older AGP and could be fixed locally by cleaning previous build files. IMO we should remove it from end application gradle files to see if issue is resolved now and even if it's not - AFAIR we have a step in build from source section noting to call make clean
before building from source. If we leave it - we may simply hide some error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Earlier releases of gl-native did not exclude common.so
explicitly from packagingOptions
, i guess that's why pickFirst was added in the above config. If i understand correctly even building from source, the libs files are packaged as per packaginOptions
in gradle. since now we exclude common.so
from package with 10.4.0-beta.2, it shouldn't matter if we pickFirst
in the config above. But we can keep it just be sure, wdyt? 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can remove it and if we encounter issues while building from source, we add it back 🙂 Better to verify build from source first.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can remove it and if we encounter issues while building from source, we add it back 🙂 Better to verify build from source first.
Attached internal ticket points to this pr which has buildFromSource
passed. I think that would be fine to verify this behaviour?
@@ -35,7 +35,6 @@ android { | |||
if (buildFromSource.toBoolean()) { | |||
jniLibs.pickFirsts.add("**/libc++_shared.so") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ank27 do we need that by the way? I was under an impression that gl-native does not contain libc++_shared and only common does and in that case we don't need pick first
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Technically we don't need this as well, since only common adds this and gl-native exclude it. But I guess we can keep it the same as before.
Also, I don't know if any other project builds libc++_shared.so
file, why was this added in the first place?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is used for building from source, where I think gl-native indeed will bundle the libc++_shared.so
when built from source, we could verify it by building the project from source.
1d3d338
to
181cc5f
Compare
bf9e702
to
300405c
Compare
Summary of changes
Bump gl-native to 10.4.0-beta.2
Revert common.so changes.
User impact (optional)
Pull request checklist:
@JvmOverloads
,@file:JvmName
, etc)../gradlew apiDump
to update generated api files, if there's public API changes, otherwise theverify-kotlin-binary-compatibility
CI will fail.mapbox-maps-android
changelog:<changelog></changelog>
.v10.[version]
release branch fix / enhancement, merge it tomain
firstly and then port tov10.[version]
release branch.Fixes: < Link to related issues that will be fixed by this pull request, if they exist >
PRs must be submitted under the terms of our Contributor License Agreement CLA.