From 833560bfa2a755af2ce04447802f49fe92bf6fa3 Mon Sep 17 00:00:00 2001
From: Logan Chien <loganchien@google.com>
Date: Thu, 5 Dec 2019 13:59:14 -0800
Subject: [PATCH 1/2] header-checker: Migrate to clang-r370808

Bug: 139945549
Test: lunch aosp_arm64-userdebug && mm && ./tests/test.py
Change-Id: I348d179f6c63f975e1b2c539264ee903e8a8e11b
---
 vndk/tools/header-checker/src/dumper/frontend_action.cpp   | 4 ++--
 .../header-checker/src/dumper/frontend_action_factory.cpp  | 7 +++++--
 .../header-checker/src/dumper/frontend_action_factory.h    | 2 +-
 .../header-checker/src/repr/symbol/so_file_parser.cpp      | 4 +++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/vndk/tools/header-checker/src/dumper/frontend_action.cpp b/vndk/tools/header-checker/src/dumper/frontend_action.cpp
index 6b773267b..b4d6ebfa9 100644
--- a/vndk/tools/header-checker/src/dumper/frontend_action.cpp
+++ b/vndk/tools/header-checker/src/dumper/frontend_action.cpp
@@ -24,7 +24,7 @@
 #include <clang/Frontend/CompilerInstance.h>
 #include <clang/Lex/Preprocessor.h>
 
-#include <llvm/ADT/STLExtras.h>
+#include <utility>
 
 
 namespace header_checker {
@@ -39,7 +39,7 @@ std::unique_ptr<clang::ASTConsumer>
 HeaderCheckerFrontendAction::CreateASTConsumer(clang::CompilerInstance &ci,
                                                llvm::StringRef header_file) {
   // Create AST consumers.
-  return llvm::make_unique<HeaderASTConsumer>(&ci, options_);
+  return std::make_unique<HeaderASTConsumer>(&ci, options_);
 }
 
 bool HeaderCheckerFrontendAction::BeginInvocation(clang::CompilerInstance &ci) {
diff --git a/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp b/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp
index 307b9160d..06f60ade8 100644
--- a/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp
+++ b/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp
@@ -18,6 +18,8 @@
 
 #include <clang/Frontend/FrontendActions.h>
 
+#include <utility>
+
 
 namespace header_checker {
 namespace dumper {
@@ -27,8 +29,9 @@ HeaderCheckerFrontendActionFactory::HeaderCheckerFrontendActionFactory(
     HeaderCheckerOptions &options)
     : options_(options) {}
 
-clang::FrontendAction *HeaderCheckerFrontendActionFactory::create() {
-  return new HeaderCheckerFrontendAction(options_);
+std::unique_ptr<clang::FrontendAction>
+HeaderCheckerFrontendActionFactory::create() {
+  return std::make_unique<HeaderCheckerFrontendAction>(options_);
 }
 
 
diff --git a/vndk/tools/header-checker/src/dumper/frontend_action_factory.h b/vndk/tools/header-checker/src/dumper/frontend_action_factory.h
index 0a7d4094c..61ce4f30d 100644
--- a/vndk/tools/header-checker/src/dumper/frontend_action_factory.h
+++ b/vndk/tools/header-checker/src/dumper/frontend_action_factory.h
@@ -35,7 +35,7 @@ class HeaderCheckerFrontendActionFactory
  public:
   HeaderCheckerFrontendActionFactory(HeaderCheckerOptions &options);
 
-  clang::FrontendAction *create() override;
+  std::unique_ptr<clang::FrontendAction> create() override;
 };
 
 
diff --git a/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp b/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
index 451c139f1..9320a5480 100644
--- a/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
+++ b/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
@@ -21,6 +21,8 @@
 #include <llvm/Object/ELFTypes.h>
 #include <llvm/Object/SymbolSize.h>
 
+#include <utility>
+
 
 namespace header_checker {
 namespace repr {
@@ -112,7 +114,7 @@ ELFSoFileParser<T>::ELFSoFileParser(const llvm::object::ELFObjectFile<T> *obj) {
 template <typename T>
 static std::unique_ptr<SoFileParser> CreateELFSoFileParser(
     const llvm::object::ELFObjectFile<T> *elfo) {
-  return llvm::make_unique<ELFSoFileParser<T>>(elfo);
+  return std::make_unique<ELFSoFileParser<T>>(elfo);
 }
 
 

From 1fd2cdb777e201a42741b2bd42208d91c50b15bf Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers@google.com>
Date: Thu, 5 Dec 2019 13:02:48 -0800
Subject: [PATCH 2/2] clang-tools: upgrade to r370808

Bug: 139945549
Test: cd $ANDROID_BUILD_TOP && \
 OUT_DIR=out ./development/vndk/tools/header-checker/android/build-prebuilts.sh
Change-Id: I48de2adac9122206c78625988e11f47ce667d9b8
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
 vndk/tools/header-checker/android/envsetup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index 2c53531d5..e372a8058 100644
--- a/vndk/tools/header-checker/android/envsetup.sh
+++ b/vndk/tools/header-checker/android/envsetup.sh
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 export LLVM_BUILD_HOST_TOOLS=true
-export LLVM_PREBUILTS_VERSION=clang-r365631b
-export LLVM_RELEASE_VERSION=9.0.7
+export LLVM_PREBUILTS_VERSION=clang-r370808
+export LLVM_RELEASE_VERSION=10.0.1