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

Remove the "nativeLibsToJar" gradle task. #2370

Merged

Conversation

sigmabeta
Copy link
Contributor

It's not necessary; Gradle will include any *.so files you place in the jniLibs folder for a given build configuration. (i.e. main vs. debug, though we don't differentiate right now.)

However, this means that the native libraries must actually be placed there, so this PR modifies CMakeLists.txt to ensure that successful builds target that folder.

@Sonicadvance1
Copy link
Contributor

Fixes stuff for me.

Sonicadvance1 added a commit that referenced this pull request May 6, 2015
Remove the "nativeLibsToJar" gradle task.
@Sonicadvance1 Sonicadvance1 merged commit 80fe5e0 into dolphin-emu:master May 6, 2015
@sigmabeta
Copy link
Contributor Author

Hm, I didn't think this would actually fix anything other than just being a bit cleaner. What are you referring to?

@Sonicadvance1
Copy link
Contributor

Fixes the buildbot trying to package the libraries twice which caused a build failure earlier today.

@sigmabeta
Copy link
Contributor Author

That's really weird. I took a look at that build failure; it's weird for several reasons:

  • It happened on an unrelated PR (PixelShaderCache: Fix MSAA depth copy shader. #2372)
  • If anything, it was caused by this PR: the conflict was between the contents of native-libs.jar and the jniLibs folder. The latter didn't exist until this PR.
  • However, the former shouldn't exist anymore as a result of this PR.

Is it somehow possible that pr-android is not performing a gradle clean before building the APK? That seems the most likely explanation, and is something that we should resolve if true.

@Sonicadvance1
Copy link
Contributor

It definitely isn't running a clean between PR builds.

@sigmabeta sigmabeta deleted the native-libs-task-removal branch June 9, 2015 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants