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

Android-ndk fix #266

Merged
merged 2 commits into from
Mar 22, 2016
Merged

Android-ndk fix #266

merged 2 commits into from
Mar 22, 2016

Conversation

LyzardKing
Copy link
Collaborator

This reflects the changes made on the download page for the android ndk.
The download is now a zipfile, only for 64 bit arch.
The checksum now is sha1 instead of md5.
The large test works on my system.
The medium tests are fixed.
Since I know nothing about the ndk, I'm not sure what to test.
At the moment the only check is the existence of the main executable, as described on the webpage.
If there is something better that needs to be tested please let me know.

Fixes #265

@LyzardKing
Copy link
Collaborator Author

I also added clang as a dependency, since it is now the supported compiler.

@@ -54,7 +54,7 @@ class AndroidNDKContainer(ContainerTests, test_android.AndroidNDKTests):

def setUp(self):
self.hosts = {443: ["developer.android.com"]}
self.apt_repo_override_path = os.path.join(self.APT_FAKE_REPO_PATH, 'android')
self.apt_repo_override_path = os.path.join(self.APT_FAKE_REPO_PATH, 'android-ndk')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see you creating a separate android-ndk repository for medium tests but you did change that path, did you get the medium tests working with this change? Was there already a separate repository that I don't see? :)

@didrocks
Copy link
Member

And here is a review! Just a comment on the medium repository "android-ndk" that you now reference. I'm quite surprised this works for you or maybe you forgot to include in the commits a "docker/create_packages.sh" changes?

Other than that, I did test it and it's good.

@LyzardKing
Copy link
Collaborator Author

Yes, I forgot about the docker/create_packages.sh file.
I read that gcc is deprecated in the ndk (https://android.googlesource.com/platform/ndk.git/+/master/CHANGELOG.md)
Should we add clang to the normal android repo in create_packages?

@didrocks
Copy link
Member

yeah, let's follow upstream's practices.

@LyzardKing
Copy link
Collaborator Author

I noticed that the zipfile is in another directory on the google server.
I'll change the download page in our test.

zipfile now in dl.google.com
medium test works
@didrocks
Copy link
Member

Perfect! I'm merging this :)

Once the other is merged as well, can you just sum up what tests are passing and not passing for you? I must say I'm a little bit lost in the email threads :) (I know that you can't run the tests in the vm due to python2 exceptions)

didrocks added a commit that referenced this pull request Mar 22, 2016
@didrocks didrocks merged commit 344a2e1 into ubuntu:master Mar 22, 2016
@LyzardKing LyzardKing deleted the android-ndk branch March 10, 2017 14:49
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.

Cannot install android-ndk
2 participants