This is an archive of the discontinued LLVM Phabricator instance.

Set default ndk version to 21.
AbandonedPublic

Authored by oontvoo on Oct 22 2020, 7:59 PM.

Details

Reviewers
vitalybuka
Summary

The compiler-rt/test/lit.common.cfg.py (around line 68) decides to use libstdc++ if the ndk version is older than 18.

Diff Detail

Event Timeline

oontvoo created this revision.Oct 22 2020, 7:59 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 22 2020, 7:59 PM
Herald added subscribers: Restricted Project, mgorny. · View Herald Transcript
oontvoo requested review of this revision.Oct 22 2020, 7:59 PM
oontvoo edited the summary of this revision. (Show Details)Oct 22 2020, 8:01 PM
oontvoo added a reviewer: vitalybuka.
oontvoo edited the summary of this revision. (Show Details)Oct 23 2020, 9:36 AM
vitalybuka added a subscriber: pcc.Oct 23 2020, 4:41 PM
vitalybuka added inline comments.
compiler-rt/CMakeLists.txt
127

we should use cmake -DANDROID_NDK_VERSION= with a real version

@pcc D57733 looks like a temporarily workaround. After we switch the bot past 19 we should remove ANDROID_NDK_VERSION and android_ndk_version from the code.

pcc added inline comments.Oct 23 2020, 4:53 PM
compiler-rt/CMakeLists.txt
127

Yes, once we start requiring NDK >= r19 we should be able to remove this.

oontvoo marked 2 inline comments as done.Oct 23 2020, 5:10 PM
oontvoo added inline comments.
compiler-rt/CMakeLists.txt
127

we should use cmake -DANDROID_NDK_VERSION= with a real version

@pcc D57733 looks like a temporarily workaround. After we switch the bot past 19 we should remove ANDROID_NDK_VERSION and android_ndk_version from the code.

Ok, so it's chicken-n-egg? Do we want to switch the bot first? or update this first?

oontvoo updated this revision to Diff 301355.Oct 28 2020, 11:29 AM
oontvoo edited the summary of this revision. (Show Details)

updated

oontvoo abandoned this revision.Oct 28 2020, 7:34 PM

This is no longer needed, because we just use -DANDROID_NDK_VERSION