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

configure.ac:Changing android ndk directory existence test #9873

Merged
merged 1 commit into from
Jun 1, 2016

Conversation

vadikml
Copy link
Contributor

@vadikml vadikml commented May 24, 2016

Starting ndk 11 ndk_dir/RELEASE.TXT was removed.
The new file to test is ndk_dir/source.properties according to a proposal at
http://forum.kodi.tv/showthread.php?tid=274621&pid=2337598#pid2337598
for the ability to configure the build for both prior and post 11 ndk version, changing the test for any of the mentioned files above (“or” between both of them).
Actually as seen in the actual change below the test is "&&"
If both of them are absent, then the test fails.
If one of them is present then it passes this sanity check.

Starting ndk 11 ndk_dir/RELEASE.TXT was removed.
The new file to test is ndk_dir/source.properties according to a proposal at
http://forum.kodi.tv/showthread.php?tid=274621&pid=2337598#pid2337598
for the ability to configure the build for both prior and post 11 ndk version, changing the test for any of the mentioned files above (“or” between both of them).
@stefansaraev
Copy link
Contributor

jenkins build this please

@MrMC
Copy link

MrMC commented May 24, 2016

nice :)

@stefansaraev stefansaraev merged commit eaaf192 into xbmc:master Jun 1, 2016
@hudokkow hudokkow added this to the Krypton 17.0-alpha2 milestone Jun 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants