Merge "Allow symlinks to be included while collecting exported headers."

Author: Jayant Chowdhary

vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp

@@ -61,12 +61,7 @@ std::string ABIWrapper::GetDeclSourceFile(const clang::Decl *decl,
   // belonging to the library.
   clang::SourceLocation expansion_location = sm.getExpansionLoc(location);
   llvm::StringRef file_name = sm.getFilename(expansion_location);
-  std::string file_name_adjusted = "";
-  char file_abs_path[PATH_MAX];
-  if (realpath(file_name.str().c_str(), file_abs_path) == nullptr) {
-    return "";
-  }
-  return file_abs_path;
+  return abi_util::RealPath(file_name.str());
 }
 
 static abi_util::AccessSpecifierIR AccessClangToIR(

vndk/tools/header-checker/header-abi-dumper/src/ast_processing.h

@@ -87,7 +87,7 @@ class HeaderASTConsumer : public clang::ASTConsumer {
   std::string file_name_;
   clang::CompilerInstance *cip_;
   std::string out_dump_name_;
-  std::set<std::string> exported_headers_;
+  const std::set<std::string> &exported_headers_;
 };
 
 #endif // AST_PROCESSING_H_

vndk/tools/header-checker/header-abi-dumper/src/frontend_action.cpp

@@ -25,16 +25,13 @@
 #include <llvm/Support/Path.h>
 
 HeaderCheckerFrontendAction::HeaderCheckerFrontendAction(
-    const std::string &dump_name, const std::vector<std::string> &exports)
-  : dump_name_(dump_name), exported_header_dirs_(exports) { }
+    const std::string &dump_name, const std::set<std::string> &exported_headers)
+  : dump_name_(dump_name), exported_headers_(exported_headers) { }
 
 std::unique_ptr<clang::ASTConsumer>
 HeaderCheckerFrontendAction::CreateASTConsumer(clang::CompilerInstance &ci,
                                                llvm::StringRef header_file) {
-  std::set<std::string> exported_headers;
-  exported_headers = abi_util::CollectAllExportedHeaders(exported_header_dirs_);
   // Create AST consumers.
-  return llvm::make_unique<HeaderASTConsumer>(header_file,
-                                              &ci, dump_name_,
-                                              exported_headers);
+  return llvm::make_unique<HeaderASTConsumer>(header_file, &ci, dump_name_,
+                                              exported_headers_);
 }

vndk/tools/header-checker/header-abi-dumper/src/frontend_action.h

@@ -31,12 +31,12 @@ namespace clang {
 class HeaderCheckerFrontendAction : public clang::ASTFrontendAction {
  private:
   std::string dump_name_;
-  const std::vector<std::string> &exported_header_dirs_;
+  const std::set<std::string> &exported_headers_;
 
  public:
   HeaderCheckerFrontendAction(
       const std::string &dump_name,
-      const std::vector<std::string> &export_header_dirs);
+      const std::set<std::string> &exported_headers);
 
  protected:
   std::unique_ptr<clang::ASTConsumer> CreateASTConsumer(

vndk/tools/header-checker/header-abi-dumper/src/frontend_action_factory.cpp

@@ -20,9 +20,9 @@
 
 HeaderCheckerFrontendActionFactory::HeaderCheckerFrontendActionFactory(
     const std::string &dump_name,
-    const std::vector<std::string> &export_header_dirs)
-  : dump_name_(dump_name), export_header_dirs_(export_header_dirs) { }
+    const std::set<std::string> &exported_headers)
+  : dump_name_(dump_name), exported_headers_(exported_headers) { }
 
 clang::FrontendAction *HeaderCheckerFrontendActionFactory::create() {
-  return new HeaderCheckerFrontendAction(dump_name_, export_header_dirs_);
+  return new HeaderCheckerFrontendAction(dump_name_, exported_headers_);
 }

vndk/tools/header-checker/header-abi-dumper/src/frontend_action_factory.h

@@ -23,12 +23,12 @@ class HeaderCheckerFrontendActionFactory
     : public clang::tooling::FrontendActionFactory {
  private:
   std::string dump_name_;
-  const std::vector<std::string> &export_header_dirs_;
+  const std::set<std::string> &exported_headers_;
 
  public:
   HeaderCheckerFrontendActionFactory(
       const std::string &dump_name,
-      const std::vector<std::string> &exported_header_dirs);
+      const std::set<std::string> &exported_headers);
 
   clang::FrontendAction *create() override;
 };

vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "frontend_action_factory.h"
+#include <header_abi_util.h>
 
 #include <clang/Frontend/FrontendActions.h>
 #include <clang/Tooling/CommonOptionsParser.h>
@@ -96,16 +97,18 @@ int main(int argc, const char **argv) {
     ::exit(1);
   }
 
-  if (no_filter) {
-    static_cast<std::vector<std::string> &>(exported_header_dirs).clear();
+  std::set<std::string> exported_headers;
+  if (!no_filter) {
+    exported_headers =
+        abi_util::CollectAllExportedHeaders(exported_header_dirs);
   }
 
   // Initialize clang tools and run front-end action.
   std::vector<std::string> header_files{ header_file };
 
   clang::tooling::ClangTool tool(*compilations, header_files);
   std::unique_ptr<clang::tooling::FrontendActionFactory> factory(
-      new HeaderCheckerFrontendActionFactory(out_dump, exported_header_dirs));
+      new HeaderCheckerFrontendActionFactory(out_dump, exported_headers));
 
   return tool.run(factory.get());
 }

vndk/tools/header-checker/header-abi-util/include/header_abi_util.h

@@ -32,6 +32,8 @@ using llvm::object::ELFDataTypeTypedefHelper;
 
 namespace abi_util {
 
+std::string RealPath(const std::string &path);
+
 std::set<std::string> CollectAllExportedHeaders(
     const std::vector<std::string> &exported_header_dirs);
 

vndk/tools/header-checker/header-abi-util/src/collect_exported_headers.cpp

@@ -37,6 +37,14 @@ static bool ShouldSkipFile(llvm::StringRef &file_name) {
   return false;
 }
 
+std::string RealPath(const std::string &path) {
+  char file_abs_path[PATH_MAX];
+  if (realpath(path.c_str(), file_abs_path) == nullptr) {
+    return "";
+  }
+  return file_abs_path;
+}
+
 bool CollectExportedHeaderSet(const std::string &dir_name,
                               std::set<std::string> *exported_headers) {
   std::error_code ec;
@@ -66,17 +74,13 @@ bool CollectExportedHeaderSet(const std::string &dir_name,
       return false;
     }
 
-    if (!llvm::sys::fs::is_regular_file(status)) {
-      // Ignore non regular files. eg: soft links.
+    if ((status.type() != llvm::sys::fs::file_type::symlink_file) &&
+        !llvm::sys::fs::is_regular_file(status)) {
+      // Ignore non regular files, except symlinks.
       continue;
     }
 
-    llvm::SmallString<128> abs_path(file_path);
-    if (llvm::sys::fs::make_absolute(abs_path)) {
-      llvm::errs() << "Failed to get absolute path for : " << file_name << "\n";
-      return false;
-    }
-    exported_headers->insert(abs_path.str());
+    exported_headers->insert(RealPath(file_path));
   }
   return true;
 }