Skip to content

[Android] remove old ndk as not used#697

Merged
glennguy merged 2 commits intoxbmc:Nexusfrom
matthuisman:remove_ndk
Sep 28, 2021
Merged

[Android] remove old ndk as not used#697
glennguy merged 2 commits intoxbmc:Nexusfrom
matthuisman:remove_ndk

Conversation

@matthuisman
Copy link
Contributor

@matthuisman matthuisman commented May 20, 2021

remove wvdecrypter_android.cpp and CMakeLists.txt.ndk

rename wvdecrypter_android_jni.cpp to wvdecrypter_android.cpp
update CMakeLists.txt

Pretty sure we dont use ndk anymore as kodi was moved to jni

@glennguy
Copy link
Contributor

Is there a way you can do this in git so that it will show as the file getting renamed? Maybe it would work across 2 commits? If not maybe just better to delete wvdecrypter_android and not rename wvdecrypter_android_jni.

I'm thinking about being able to use blame and history, that's all.

@matthuisman
Copy link
Contributor Author

Haha. I had the same thought. I then did over two commits but when making the pull request, it showed as the same. But now I think that's because the pr window shows the changes all together! I'll try again.

@matthuisman
Copy link
Contributor Author

@glennguy
looks better now over 2 commits - thank you

@AlwinEsch AlwinEsch changed the base branch from Matrix to Nexus September 14, 2021 14:31
@matthuisman
Copy link
Contributor Author

@glennguy
this also good to go for Nexus

@glennguy glennguy requested a review from phunkyfish September 28, 2021 12:04
Copy link
Contributor

@glennguy glennguy left a comment

Choose a reason for hiding this comment

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

LGTM

@matthuisman
Copy link
Contributor Author

@glennguy ready now :)

@glennguy glennguy merged commit b8a13c8 into xbmc:Nexus Sep 28, 2021
@matthuisman matthuisman deleted the remove_ndk branch September 29, 2021 00:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments