Fixes for Issue 360 #384
Merged
Fixes for Issue 360 #384
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Split out the responsibilities of the cleanUp method and renamed to attachNativeLib.
Simplified still further. Resigned myself to the fact that NDK Executable just wants to build at the root folder.
… in the list of dependencies. Native artifacts built in the project will still be included in the APK.
Remove MakefileHelperTest as this was all testing construction of relative paths.
…ilding APK. Moved ndkOutputDirectory to AbstractAndroidMojo as it is shared by NdkBuildMojo, AarMojo, ApklibMojo and ApkMojo. Renamed 'ndkArchitecture' variables to 'architecture' to disambiguate from a similarly named class attribute.
|
From the feedback I see this seems ready to merge. Correct? |
|
Yep. Looks like it works as expected. |
|
No ... am fine with merging as is. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Manfred I have keep all the commit so that it can more readily be reviewed step at a time, but give the word and I will squash it into a single commit.
This branch doesn't attempt to resolve the larger issues in #380 it focuses solely on #360 and making the NDK build hopefully a little more comprehensible. Eg NDK libraries are still constructed in ${basedir}/obj/local