LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use clang-r416183b for clang-tools build" am: 5a81e1cf66

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1676650

Change-Id: Ied9761ba483d9659cb3084cc9c5024666a11af1f
This commit is contained in:
Pirama Arumuga Nainar
2021-04-16 21:18:07 +00:00
committed by Automerger Merge Worker
parent 5715d5e802 5a81e1cf66
commit fb1cac7d60
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vndk/tools/header-checker/android/envsetup.sh
View File

@@ -15,5 +15,5 @@
# limitations under the License.
export LLVM_BUILD_HOST_TOOLS=true
export LLVM_PREBUILTS_VERSION=clang-r412851
export LLVM_RELEASE_VERSION=12.0.3
export LLVM_PREBUILTS_VERSION=clang-r416183b
export LLVM_RELEASE_VERSION=12.0.5

7
vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
View File

@@ -56,8 +56,6 @@ template <typename T>
class ELFSoFileParser : public SoFileParser {
private:
LLVM_ELF_IMPORT_TYPES_ELFT(T)
typedef llvm::object::ELFFile<T> ELFO;
typedef typename ELFO::Elf_Sym Elf_Sym;
public:
ELFSoFileParser(const llvm::object::ELFObjectFile<T> *obj);
@@ -91,8 +89,9 @@ ELFSoFileParser<T>::ELFSoFileParser(const llvm::object::ELFObjectFile<T> *obj) {
exported_symbols_.reset(new ExportedSymbolSet());
for (auto symbol_it : obj->getDynamicSymbolIterators()) {
const Elf_Sym *elf_sym = obj->getSymbol(symbol_it.getRawDataRefImpl());
assert (elf_sym != nullptr);
auto elf_sym_or_error = obj->getSymbol(symbol_it.getRawDataRefImpl());
assert (elf_sym_or_error);
const Elf_Sym *elf_sym = elf_sym_or_error.get();
if (!IsSymbolExported(elf_sym) || elf_sym->isUndefined()) {
continue;
}