header-checker: Restructure the source tree

Test: ./tests/test.py
Test: ${ANDROID_HOST_OUT}/nativetest64/\
      header-checker-unittests/header-checker-unittests
Change-Id: I6dd907b6fd233ea1f529d263a603c56f9a5034cc

53 files changed, 144 insertions, 119 deletions

diff --git a/vndk/tools/header-checker/Android.bp b/vndk/tools/header-checker/Android.bp
index 8edebdda1..a27385f02 100644
--- a/vndk/tools/header-checker/Android.bp
+++ b/vndk/tools/header-checker/Android.bp
@@ -41,6 +41,10 @@ cc_defaults {
         },
     },
 
+    local_include_dirs: [
+        "src",
+    ],
+
     compile_multilib: "64",
     stl: "none",
 }
@@ -53,18 +57,18 @@ cc_binary_host {
     ],
 
     srcs: [
-        "header-abi-dumper/src/abi_wrappers.cpp",
-        "header-abi-dumper/src/ast_processing.cpp",
-        "header-abi-dumper/src/diagnostic_consumer.cpp",
-        "header-abi-dumper/src/fake_decl_source.cpp",
-        "header-abi-dumper/src/fixed_argv.cpp",
-        "header-abi-dumper/src/frontend_action.cpp",
-        "header-abi-dumper/src/frontend_action_factory.cpp",
-        "header-abi-dumper/src/header_checker.cpp",
+        "src/dumper/abi_wrappers.cpp",
+        "src/dumper/ast_processing.cpp",
+        "src/dumper/diagnostic_consumer.cpp",
+        "src/dumper/fake_decl_source.cpp",
+        "src/dumper/fixed_argv.cpp",
+        "src/dumper/frontend_action.cpp",
+        "src/dumper/frontend_action_factory.cpp",
+        "src/dumper/header_checker.cpp",
     ],
 
     static_libs: [
-        "libheader-abi-util",
+        "libheader-checker",
         "libheader-checker-proto",
         "libjsoncpp",
     ],
@@ -83,7 +87,7 @@ cc_defaults {
     defaults: ["header-checker-defaults"],
 
     static_libs: [
-        "libheader-abi-util",
+        "libheader-checker",
         "libheader-checker-proto",
         "libjsoncpp",
     ],
@@ -105,7 +109,7 @@ cc_binary_host {
     ],
 
     srcs: [
-        "header-abi-linker/src/header_abi_linker.cpp",
+        "src/linker/header_abi_linker.cpp",
     ],
 }
 
@@ -118,9 +122,9 @@ cc_binary_host {
     ],
 
     srcs: [
-        "header-abi-diff/src/abi_diff.cpp",
-        "header-abi-diff/src/abi_diff_wrappers.cpp",
-        "header-abi-diff/src/header_abi_diff.cpp",
+        "src/diff/abi_diff.cpp",
+        "src/diff/abi_diff_wrappers.cpp",
+        "src/diff/header_abi_diff.cpp",
     ],
 }
 
@@ -133,28 +137,28 @@ cc_binary_host {
     ],
 
     srcs: [
-        "merge-abi-diff/src/merge_abi_diff.cpp",
+        "src/diff_merge/merge_abi_diff.cpp",
     ],
 }
 
 cc_library_host_static {
-    name: "libheader-abi-util",
+    name: "libheader-checker",
 
     defaults: [
         "header-checker-defaults",
     ],
 
     srcs: [
-        "header-abi-util/src/abi_diff_helpers.cpp",
-        "header-abi-util/src/api_level.cpp",
-        "header-abi-util/src/collect_exported_headers.cpp",
-        "header-abi-util/src/exported_symbol_set.cpp",
-        "header-abi-util/src/ir_representation.cpp",
-        "header-abi-util/src/ir_representation_json.cpp",
-        "header-abi-util/src/ir_representation_protobuf.cpp",
-        "header-abi-util/src/so_file_parser.cpp",
-        "header-abi-util/src/string_utils.cpp",
-        "header-abi-util/src/version_script_parser.cpp",
+        "src/repr/abi_diff_helpers.cpp",
+        "src/repr/ir_representation.cpp",
+        "src/repr/json/ir_representation_json.cpp",
+        "src/repr/protobuf/ir_representation_protobuf.cpp",
+        "src/repr/symbol/exported_symbol_set.cpp",
+        "src/repr/symbol/so_file_parser.cpp",
+        "src/repr/symbol/version_script_parser.cpp",
+        "src/utils/api_level.cpp",
+        "src/utils/collect_exported_headers.cpp",
+        "src/utils/string_utils.cpp",
     ],
 
     static_libs: [
@@ -173,32 +177,26 @@ cc_library_host_static {
         "-Wno-long-long",
         "-Wno-unused-parameter",
     ],
-
-    export_include_dirs: ["header-abi-util/include"],
 }
 
 cc_test_host {
-    name: "libheader-abi-util_test",
+    name: "header-checker-unittests",
 
     defaults: [
         "header-checker-defaults",
     ],
 
     srcs: [
-        "header-abi-util/src/api_level_test.cpp",
-        "header-abi-util/src/exported_symbol_set_test.cpp",
-        "header-abi-util/src/string_utils_test.cpp",
-        "header-abi-util/src/version_script_parser_test.cpp",
-    ],
-
-    local_include_dirs: [
-        "header-abi-util/include",
+        "src/repr/symbol/exported_symbol_set_test.cpp",
+        "src/repr/symbol/version_script_parser_test.cpp",
+        "src/utils/api_level_test.cpp",
+        "src/utils/string_utils_test.cpp",
     ],
 
     static_libs: [
         "libgtest",
         "libgtest_main",
-        "libheader-abi-util",
+        "libheader-checker",
     ],
 
     shared_libs: [
diff --git a/vndk/tools/header-checker/header-abi-diff/src/abi_diff.cpp b/vndk/tools/header-checker/src/diff/abi_diff.cpp
index a72636abf..829b7415b 100644
--- a/vndk/tools/header-checker/header-abi-diff/src/abi_diff.cpp
+++ b/vndk/tools/header-checker/src/diff/abi_diff.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "abi_diff.h"
+#include "diff/abi_diff.h"
 
-#include "header_abi_util.h"
+#include "utils/header_abi_util.h"
 
 #include <llvm/Support/raw_ostream.h>
 
@@ -24,6 +24,7 @@
 
 #include <stdlib.h>
 
+
 abi_util::CompatibilityStatusIR HeaderAbiDiff::GenerateCompatibilityReport() {
   using abi_util::TextFormatToIRReader;
   std::unique_ptr<abi_util::TextFormatToIRReader> old_reader =
diff --git a/vndk/tools/header-checker/header-abi-diff/src/abi_diff.h b/vndk/tools/header-checker/src/diff/abi_diff.h
index 4604b0fcc..8e288214e 100644
--- a/vndk/tools/header-checker/header-abi-diff/src/abi_diff.h
+++ b/vndk/tools/header-checker/src/diff/abi_diff.h
@@ -15,12 +15,13 @@
 #ifndef ABI_DIFF_H_
 #define ABI_DIFF_H_
 
-#include "abi_diff_wrappers.h"
-#include "ir_representation.h"
+#include "diff/abi_diff_wrappers.h"
+#include "repr/ir_representation.h"
 
 #include <string>
 #include <vector>
 
+
 using abi_util::AbiElementMap;
 using abi_util::DiffPolicyOptions;
 
diff --git a/vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.cpp b/vndk/tools/header-checker/src/diff/abi_diff_wrappers.cpp
index 4614bea6c..3a2ab7fb1 100644
--- a/vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.cpp
+++ b/vndk/tools/header-checker/src/diff/abi_diff_wrappers.cpp
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "abi_diff_wrappers.h"
+#include "diff/abi_diff_wrappers.h"
 
-#include "header_abi_util.h"
+#include "utils/header_abi_util.h"
 
 #include <llvm/Support/raw_ostream.h>
 
+
 namespace abi_diff_wrappers {
 
 using abi_util::AbiElementMap;
diff --git a/vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.h b/vndk/tools/header-checker/src/diff/abi_diff_wrappers.h
index 8a4845254..f4692b5d4 100644
--- a/vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.h
+++ b/vndk/tools/header-checker/src/diff/abi_diff_wrappers.h
@@ -15,10 +15,9 @@
 #ifndef ABI_DIFF_WRAPPERS_H_
 #define ABI_DIFF_WRAPPERS_H_
 
-#include "abi_diff_helpers.h"
-#include "ir_representation.h"
+#include "repr/abi_diff_helpers.h"
+#include "repr/ir_representation.h"
 
-#include <deque>
 
 namespace abi_diff_wrappers {
 
diff --git a/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp b/vndk/tools/header-checker/src/diff/header_abi_diff.cpp
index a3a3ab295..5f2733c8d 100644
--- a/vndk/tools/header-checker/header-abi-diff/src/header_abi_diff.cpp
+++ b/vndk/tools/header-checker/src/diff/header_abi_diff.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "abi_diff.h"
+#include "diff/abi_diff.h"
 
 #include <llvm/Support/CommandLine.h>
 #include <llvm/Support/FileSystem.h>
@@ -20,6 +20,7 @@
 
 #include <fstream>
 
+
 static llvm::cl::OptionCategory header_checker_category(
     "header-abi-diff options");
 
diff --git a/vndk/tools/header-checker/merge-abi-diff/src/merge_abi_diff.cpp b/vndk/tools/header-checker/src/diff_merge/merge_abi_diff.cpp
index 7844261e9..8aa1a6056 100644
--- a/vndk/tools/header-checker/merge-abi-diff/src/merge_abi_diff.cpp
+++ b/vndk/tools/header-checker/src/diff_merge/merge_abi_diff.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "header_abi_util.h"
+#include "utils/header_abi_util.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -35,6 +35,7 @@
 
 #include <stdlib.h>
 
+
 static llvm::cl::OptionCategory merge_abi_diff_category(
     "merge-abi-diff options");
 
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
index d5773caad..005a957c2 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp
+++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "abi_wrappers.h"
+#include "dumper/abi_wrappers.h"
 
-#include "header_abi_util.h"
+#include "utils/header_abi_util.h"
 
 #include <clang/AST/QualTypeNames.h>
 #include <clang/Index/CodegenNameGenerator.h>
@@ -25,6 +25,7 @@
 #include <limits.h>
 #include <stdlib.h>
 
+
 using namespace abi_wrapper;
 
 ABIWrapper::ABIWrapper(
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.h b/vndk/tools/header-checker/src/dumper/abi_wrappers.h
index 3505020b7..3591477b9 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.h
+++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.h
@@ -15,8 +15,8 @@
 #ifndef ABI_WRAPPERS_H_
 #define ABI_WRAPPERS_H_
 
-#include "ast_util.h"
-#include "ir_representation.h"
+#include "dumper/ast_util.h"
+#include "repr/ir_representation.h"
 
 #include <clang/AST/AST.h>
 #include <clang/AST/ASTConsumer.h>
@@ -24,6 +24,7 @@
 #include <clang/AST/VTableBuilder.h>
 #include <clang/Frontend/CompilerInstance.h>
 
+
 namespace abi_wrapper {
 
 struct TypeAndCreationStatus {
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/ast_processing.cpp b/vndk/tools/header-checker/src/dumper/ast_processing.cpp
index 0aac0e332..55308f0b9 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/ast_processing.cpp
+++ b/vndk/tools/header-checker/src/dumper/ast_processing.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ast_processing.h"
+#include "dumper/ast_processing.h"
 
-#include "abi_wrappers.h"
+#include "dumper/abi_wrappers.h"
 
 #include <clang/Lex/Token.h>
 #include <clang/AST/QualTypeNames.h>
@@ -24,6 +24,7 @@
 #include <iostream>
 #include <string>
 
+
 using abi_wrapper::ABIWrapper;
 using abi_wrapper::FunctionDeclWrapper;
 using abi_wrapper::RecordDeclWrapper;
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/ast_processing.h b/vndk/tools/header-checker/src/dumper/ast_processing.h
index 4e8cd5969..5c1d50ffe 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/ast_processing.h
+++ b/vndk/tools/header-checker/src/dumper/ast_processing.h
@@ -15,8 +15,8 @@
 #ifndef AST_PROCESSING_H_
 #define AST_PROCESSING_H_
 
-#include "ast_util.h"
-#include "header_checker.h"
+#include "dumper/ast_util.h"
+#include "dumper/header_checker.h"
 
 #include <clang/AST/AST.h>
 #include <clang/AST/ASTConsumer.h>
@@ -27,6 +27,7 @@
 
 #include <set>
 
+
 class HeaderASTVisitor
     : public clang::RecursiveASTVisitor<HeaderASTVisitor> {
  public:
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/ast_util.h b/vndk/tools/header-checker/src/dumper/ast_util.h
index 74057c592..f45b0909e 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/ast_util.h
+++ b/vndk/tools/header-checker/src/dumper/ast_util.h
@@ -20,6 +20,7 @@
 #include <map>
 #include <string>
 
+
 namespace ast_util {
 
 constexpr static char type_id_prefix[] = "type-";
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/diagnostic_consumer.cpp b/vndk/tools/header-checker/src/dumper/diagnostic_consumer.cpp
index e99e9b0ce..4cdfc53ec 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/diagnostic_consumer.cpp
+++ b/vndk/tools/header-checker/src/dumper/diagnostic_consumer.cpp
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "diagnostic_consumer.h"
+#include "dumper/diagnostic_consumer.h"
 
 #include <clang/Basic/DiagnosticCategories.h>
 #include <clang/Basic/DiagnosticIDs.h>
 #include <clang/Lex/LexDiagnostic.h>
 
+
 HeaderCheckerDiagnosticConsumer::HeaderCheckerDiagnosticConsumer(
     std::unique_ptr<clang::DiagnosticConsumer> wrapped)
     : wrapped_(std::move(wrapped)) {}
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/diagnostic_consumer.h b/vndk/tools/header-checker/src/dumper/diagnostic_consumer.h
index 927c8caf8..659dbab65 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/diagnostic_consumer.h
+++ b/vndk/tools/header-checker/src/dumper/diagnostic_consumer.h
@@ -17,6 +17,7 @@
 
 #include <clang/Basic/Diagnostic.h>
 
+
 class HeaderCheckerDiagnosticConsumer : public clang::DiagnosticConsumer {
  private:
   std::unique_ptr<clang::DiagnosticConsumer> wrapped_;
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/fake_decl_source.cpp b/vndk/tools/header-checker/src/dumper/fake_decl_source.cpp
index 417433cdf..d00509f8f 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/fake_decl_source.cpp
+++ b/vndk/tools/header-checker/src/dumper/fake_decl_source.cpp
@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "fake_decl_source.h"
+#include "dumper/fake_decl_source.h"
 
 #include <clang/Lex/Preprocessor.h>
 #include <clang/Sema/Lookup.h>
 
+
 FakeDeclSource::FakeDeclSource(const clang::CompilerInstance &ci) : ci_(ci) {}
 
 clang::CXXRecordDecl *
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/fake_decl_source.h b/vndk/tools/header-checker/src/dumper/fake_decl_source.h
index 7d9cc7950..2a1efa099 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/fake_decl_source.h
+++ b/vndk/tools/header-checker/src/dumper/fake_decl_source.h
@@ -16,6 +16,7 @@
 #include <clang/Sema/ExternalSemaSource.h>
 #include <clang/Sema/Sema.h>
 
+
 // This class creates fake declarations when the compiler queries for unknown
 // types.
 class FakeDeclSource : public clang::ExternalSemaSource {
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/fixed_argv.cpp b/vndk/tools/header-checker/src/dumper/fixed_argv.cpp
index 3ab28c9de..be947c81b 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/fixed_argv.cpp
+++ b/vndk/tools/header-checker/src/dumper/fixed_argv.cpp
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "fixed_argv.h"
+#include "dumper/fixed_argv.h"
+
 
 FixedArgvRegistry *FixedArgvRegistry::head_ = nullptr;
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/fixed_argv.h b/vndk/tools/header-checker/src/dumper/fixed_argv.h
index 61d590dcf..61d590dcf 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/fixed_argv.h
+++ b/vndk/tools/header-checker/src/dumper/fixed_argv.h
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/frontend_action.cpp b/vndk/tools/header-checker/src/dumper/frontend_action.cpp
index 6662fce87..2ce4a7510 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/frontend_action.cpp
+++ b/vndk/tools/header-checker/src/dumper/frontend_action.cpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "frontend_action.h"
+#include "dumper/frontend_action.h"
 
-#include "ast_processing.h"
-#include "diagnostic_consumer.h"
-#include "fake_decl_source.h"
-#include "header_abi_util.h"
-#include "ir_representation.h"
+#include "dumper/ast_processing.h"
+#include "dumper/diagnostic_consumer.h"
+#include "dumper/fake_decl_source.h"
+#include "repr/ir_representation.h"
+#include "utils/header_abi_util.h"
 
 #include <clang/AST/ASTConsumer.h>
 #include <clang/Frontend/CompilerInstance.h>
@@ -26,6 +26,7 @@
 
 #include <llvm/ADT/STLExtras.h>
 
+
 HeaderCheckerFrontendAction::HeaderCheckerFrontendAction(
     HeaderCheckerOptions &options)
     : options_(options) {}
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/frontend_action.h b/vndk/tools/header-checker/src/dumper/frontend_action.h
index 166e3b637..d2d34f5e9 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/frontend_action.h
+++ b/vndk/tools/header-checker/src/dumper/frontend_action.h
@@ -15,7 +15,7 @@
 #ifndef FRONTEND_ACTION_H_
 #define FRONTEND_ACTION_H_
 
-#include "header_checker.h"
+#include "dumper/header_checker.h"
 
 #include <clang/Frontend/FrontendAction.h>
 #include <llvm/ADT/StringRef.h>
@@ -25,6 +25,7 @@
 #include <string>
 #include <vector>
 
+
 namespace clang {
   class ASTConsumer;
   class CompilerInstance;
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/frontend_action_factory.cpp b/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp
index bf1448a4e..e1a8ce531 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/frontend_action_factory.cpp
+++ b/vndk/tools/header-checker/src/dumper/frontend_action_factory.cpp
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "frontend_action_factory.h"
+#include "dumper/frontend_action_factory.h"
 
-#include "frontend_action.h"
+#include "dumper/frontend_action.h"
 
 #include <clang/Frontend/FrontendActions.h>
 
+
 HeaderCheckerFrontendActionFactory::HeaderCheckerFrontendActionFactory(
     HeaderCheckerOptions &options)
     : options_(options) {}
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/frontend_action_factory.h b/vndk/tools/header-checker/src/dumper/frontend_action_factory.h
index 1f470c950..76df586d0 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/frontend_action_factory.h
+++ b/vndk/tools/header-checker/src/dumper/frontend_action_factory.h
@@ -15,13 +15,14 @@
 #ifndef FRONTEND_ACTION_FACTORY_H_
 #define FRONTEND_ACTION_FACTORY_H_
 
-#include "frontend_action.h"
-#include "ir_representation.h"
+#include "dumper/frontend_action.h"
+#include "repr/ir_representation.h"
 
 #include <clang/Tooling/Tooling.h>
 
 #include <vector>
 
+
 class HeaderCheckerFrontendActionFactory
     : public clang::tooling::FrontendActionFactory {
  private:
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp b/vndk/tools/header-checker/src/dumper/header_checker.cpp
index 25f352b95..810278c90 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/header_checker.cpp
+++ b/vndk/tools/header-checker/src/dumper/header_checker.cpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "header_checker.h"
+#include "dumper/header_checker.h"
 
-#include "fixed_argv.h"
-#include "frontend_action_factory.h"
-#include "header_abi_util.h"
+#include "dumper/fixed_argv.h"
+#include "dumper/frontend_action_factory.h"
+#include "utils/header_abi_util.h"
 
 #include <clang/Frontend/FrontendActions.h>
 #include <clang/Tooling/CommonOptionsParser.h>
@@ -32,6 +32,7 @@
 
 #include <stdlib.h>
 
+
 static llvm::cl::OptionCategory header_checker_category(
     "header-checker options");
 
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/header_checker.h b/vndk/tools/header-checker/src/dumper/header_checker.h
index 8fe4ebbc7..7fcbda6c6 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/header_checker.h
+++ b/vndk/tools/header-checker/src/dumper/header_checker.h
@@ -15,11 +15,12 @@
 #ifndef HEADER_CHECKER_H_
 #define HEADER_CHECKER_H_
 
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
 
 #include <set>
 #include <string>
 
+
 class HeaderCheckerOptions {
  public:
   std::string source_file_;
diff --git a/vndk/tools/header-checker/header-abi-linker/src/header_abi_linker.cpp b/vndk/tools/header-checker/src/linker/header_abi_linker.cpp
index 3da1ac1e4..b92c38d11 100644
--- a/vndk/tools/header-checker/header-abi-linker/src/header_abi_linker.cpp
+++ b/vndk/tools/header-checker/src/linker/header_abi_linker.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "header_abi_util.h"
-#include "ir_representation.h"
-#include "so_file_parser.h"
-#include "version_script_parser.h"
+#include "repr/ir_representation.h"
+#include "repr/symbol/so_file_parser.h"
+#include "repr/symbol/version_script_parser.h"
+#include "utils/header_abi_util.h"
 
 #include <llvm/Support/CommandLine.h>
 #include <llvm/Support/raw_ostream.h>
@@ -31,6 +31,7 @@
 
 #include <stdlib.h>
 
+
 static constexpr std::size_t kSourcesPerBatchThread = 7;
 
 static llvm::cl::OptionCategory header_linker_category(
diff --git a/vndk/tools/header-checker/header-abi-util/src/abi_diff_helpers.cpp b/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp
index 251882576..c89430b7a 100644
--- a/vndk/tools/header-checker/header-abi-util/src/abi_diff_helpers.cpp
+++ b/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp
@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "abi_diff_helpers.h"
-#include "header_abi_util.h"
+#include "repr/abi_diff_helpers.h"
+
+#include "utils/header_abi_util.h"
 
 #include <llvm/Support/raw_ostream.h>
 
+
 namespace abi_util {
 
 std::string Unwind(const std::deque<std::string> *type_queue) {
diff --git a/vndk/tools/header-checker/header-abi-util/include/abi_diff_helpers.h b/vndk/tools/header-checker/src/repr/abi_diff_helpers.h
index 3fda32663..2b4ab7029 100644
--- a/vndk/tools/header-checker/header-abi-util/include/abi_diff_helpers.h
+++ b/vndk/tools/header-checker/src/repr/abi_diff_helpers.h
@@ -15,10 +15,11 @@
 #ifndef ABI_DIFF_HELPERS_H_
 #define ABI_DIFF_HELPERS_H_
 
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
 
 #include <deque>
 
+
 // Classes which act as middle-men between clang AST parsing routines and
 // message format specific dumpers.
 namespace abi_util {
diff --git a/vndk/tools/header-checker/header-abi-util/src/ir_representation.cpp b/vndk/tools/header-checker/src/repr/ir_representation.cpp
index 26dc22e31..ab8a84b6f 100644
--- a/vndk/tools/header-checker/header-abi-util/src/ir_representation.cpp
+++ b/vndk/tools/header-checker/src/repr/ir_representation.cpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
 
-#include "abi_diff_helpers.h"
-#include "ir_representation_json.h"
-#include "ir_representation_protobuf.h"
+#include "repr/abi_diff_helpers.h"
+#include "repr/json/ir_representation_json.h"
+#include "repr/protobuf/ir_representation_protobuf.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -32,6 +32,7 @@
 #include <string>
 #include <memory>
 
+
 namespace abi_util {
 
 using MergeStatus = TextFormatToIRReader::MergeStatus;
diff --git a/vndk/tools/header-checker/header-abi-util/include/ir_representation.h b/vndk/tools/header-checker/src/repr/ir_representation.h
index 886c39e85..3f5a9bd55 100644
--- a/vndk/tools/header-checker/header-abi-util/include/ir_representation.h
+++ b/vndk/tools/header-checker/src/repr/ir_representation.h
@@ -25,6 +25,7 @@
 #include <unordered_map>
 #include <vector>
 
+
 // Classes which act as middle-men between clang AST parsing routines and
 // message format specific dumpers.
 namespace abi_util {
diff --git a/vndk/tools/header-checker/header-abi-util/src/ir_representation_json.cpp b/vndk/tools/header-checker/src/repr/json/ir_representation_json.cpp
index c04b33e0b..e7d02d783 100644
--- a/vndk/tools/header-checker/header-abi-util/src/ir_representation_json.cpp
+++ b/vndk/tools/header-checker/src/repr/json/ir_representation_json.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ir_representation_json.h"
+#include "repr/json/ir_representation_json.h"
 
 #include <json/reader.h>
 #include <json/writer.h>
@@ -24,6 +24,7 @@
 #include <sstream>
 #include <string>
 
+
 namespace abi_util {
 
 // Conversion between IR enums and JSON strings.
diff --git a/vndk/tools/header-checker/header-abi-util/include/ir_representation_json.h b/vndk/tools/header-checker/src/repr/json/ir_representation_json.h
index 9b4c36f3b..6ef215f39 100644
--- a/vndk/tools/header-checker/header-abi-util/include/ir_representation_json.h
+++ b/vndk/tools/header-checker/src/repr/json/ir_representation_json.h
@@ -15,10 +15,11 @@
 #ifndef IR_REPRESENTATION_JSON_H_
 #define IR_REPRESENTATION_JSON_H_
 
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
 
 #include <json/value.h>
 
+
 // Classes which act as middle-men between clang AST parsing routines and
 // message format specific dumpers.
 namespace abi_util {
diff --git a/vndk/tools/header-checker/header-abi-util/src/ir_representation_protobuf.cpp b/vndk/tools/header-checker/src/repr/protobuf/ir_representation_protobuf.cpp
index 5951555f8..1a6f84f69 100644
--- a/vndk/tools/header-checker/header-abi-util/src/ir_representation_protobuf.cpp
+++ b/vndk/tools/header-checker/src/repr/protobuf/ir_representation_protobuf.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "ir_representation_protobuf.h"
+#include "repr/protobuf/ir_representation_protobuf.h"
 
 #include <llvm/Support/raw_ostream.h>
 
@@ -21,6 +21,7 @@
 #include <memory>
 #include <string>
 
+
 namespace abi_util {
 
 void ProtobufTextFormatToIRReader::ReadTypeInfo(
diff --git a/vndk/tools/header-checker/header-abi-util/include/ir_representation_protobuf.h b/vndk/tools/header-checker/src/repr/protobuf/ir_representation_protobuf.h
index bacd1c965..034fe79ee 100644
--- a/vndk/tools/header-checker/header-abi-util/include/ir_representation_protobuf.h
+++ b/vndk/tools/header-checker/src/repr/protobuf/ir_representation_protobuf.h
@@ -15,7 +15,7 @@
 #ifndef IR_REPRESENTATION_PROTOBUF_H_
 #define IR_REPRESENTATION_PROTOBUF_H_
 
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
diff --git a/vndk/tools/header-checker/proto/Android.bp b/vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp
index b63254a8a..b63254a8a 100644
--- a/vndk/tools/header-checker/proto/Android.bp
+++ b/vndk/tools/header-checker/src/repr/protobuf/proto/Android.bp
diff --git a/vndk/tools/header-checker/proto/abi_diff.proto b/vndk/tools/header-checker/src/repr/protobuf/proto/abi_diff.proto
index 03f8ebe4b..03f8ebe4b 100644
--- a/vndk/tools/header-checker/proto/abi_diff.proto
+++ b/vndk/tools/header-checker/src/repr/protobuf/proto/abi_diff.proto
diff --git a/vndk/tools/header-checker/proto/abi_dump.proto b/vndk/tools/header-checker/src/repr/protobuf/proto/abi_dump.proto
index 68ec0cc70..68ec0cc70 100644
--- a/vndk/tools/header-checker/proto/abi_dump.proto
+++ b/vndk/tools/header-checker/src/repr/protobuf/proto/abi_dump.proto
diff --git a/vndk/tools/header-checker/header-abi-util/src/exported_symbol_set.cpp b/vndk/tools/header-checker/src/repr/symbol/exported_symbol_set.cpp
index 13958eb7b..94b239577 100644
--- a/vndk/tools/header-checker/header-abi-util/src/exported_symbol_set.cpp
+++ b/vndk/tools/header-checker/src/repr/symbol/exported_symbol_set.cpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "exported_symbol_set.h"
+#include "repr/symbol/exported_symbol_set.h"
 
-#include "ir_representation.h"
-#include "stl_utils.h"
-#include "string_utils.h"
+#include "repr/ir_representation.h"
+#include "utils/stl_utils.h"
+#include "utils/string_utils.h"
 
 #include <fnmatch.h>
 #include <cxxabi.h>
diff --git a/vndk/tools/header-checker/header-abi-util/include/exported_symbol_set.h b/vndk/tools/header-checker/src/repr/symbol/exported_symbol_set.h
index 886cb5435..e95920852 100644
--- a/vndk/tools/header-checker/header-abi-util/include/exported_symbol_set.h
+++ b/vndk/tools/header-checker/src/repr/symbol/exported_symbol_set.h
@@ -15,7 +15,7 @@
 #ifndef EXPORTED_SYMBOL_SET_
 #define EXPORTED_SYMBOL_SET_
 
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
 
 #include <functional>
 #include <map>
diff --git a/vndk/tools/header-checker/header-abi-util/src/exported_symbol_set_test.cpp b/vndk/tools/header-checker/src/repr/symbol/exported_symbol_set_test.cpp
index f292996df..ede545d59 100644
--- a/vndk/tools/header-checker/header-abi-util/src/exported_symbol_set_test.cpp
+++ b/vndk/tools/header-checker/src/repr/symbol/exported_symbol_set_test.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "exported_symbol_set.h"
+#include "repr/symbol/exported_symbol_set.h"
 
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
 
 #include <gtest/gtest.h>
 
diff --git a/vndk/tools/header-checker/header-abi-util/src/so_file_parser.cpp b/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
index 001f9b912..8e8b373c8 100644
--- a/vndk/tools/header-checker/header-abi-util/src/so_file_parser.cpp
+++ b/vndk/tools/header-checker/src/repr/symbol/so_file_parser.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "so_file_parser.h"
+#include "repr/symbol/so_file_parser.h"
 
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
 
 #include <llvm/Object/Binary.h>
 #include <llvm/Object/ELFObjectFile.h>
diff --git a/vndk/tools/header-checker/header-abi-util/include/so_file_parser.h b/vndk/tools/header-checker/src/repr/symbol/so_file_parser.h
index 3f5eeca49..5a68dd6ad 100644
--- a/vndk/tools/header-checker/header-abi-util/include/so_file_parser.h
+++ b/vndk/tools/header-checker/src/repr/symbol/so_file_parser.h
@@ -15,11 +15,10 @@
 #ifndef SO_FILE_PARSER_H_
 #define SO_FILE_PARSER_H_
 
-#include "exported_symbol_set.h"
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
+#include "repr/symbol/exported_symbol_set.h"
 
 #include <memory>
-#include <map>
 #include <string>
 
 
diff --git a/vndk/tools/header-checker/header-abi-util/src/version_script_parser.cpp b/vndk/tools/header-checker/src/repr/symbol/version_script_parser.cpp
index d9a717c0a..f8afed2b1 100644
--- a/vndk/tools/header-checker/header-abi-util/src/version_script_parser.cpp
+++ b/vndk/tools/header-checker/src/repr/symbol/version_script_parser.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "version_script_parser.h"
+#include "repr/symbol/version_script_parser.h"
 
-#include "exported_symbol_set.h"
-#include "string_utils.h"
+#include "repr/symbol/exported_symbol_set.h"
+#include "utils/string_utils.h"
 
 #include <iostream>
 #include <memory>
diff --git a/vndk/tools/header-checker/header-abi-util/include/version_script_parser.h b/vndk/tools/header-checker/src/repr/symbol/version_script_parser.h
index 7becddf01..225b655e4 100644
--- a/vndk/tools/header-checker/header-abi-util/include/version_script_parser.h
+++ b/vndk/tools/header-checker/src/repr/symbol/version_script_parser.h
@@ -15,12 +15,11 @@
 #ifndef VERSION_SCRIPT_PARSER_H_
 #define VERSION_SCRIPT_PARSER_H_
 
-#include "api_level.h"
-#include "exported_symbol_set.h"
-#include "ir_representation.h"
+#include "repr/ir_representation.h"
+#include "repr/symbol/exported_symbol_set.h"
+#include "utils/api_level.h"
 
 #include <functional>
-#include <map>
 #include <set>
 #include <string>
 
diff --git a/vndk/tools/header-checker/header-abi-util/src/version_script_parser_test.cpp b/vndk/tools/header-checker/src/repr/symbol/version_script_parser_test.cpp
index c84f19db2..7c1051fee 100644
--- a/vndk/tools/header-checker/header-abi-util/src/version_script_parser_test.cpp
+++ b/vndk/tools/header-checker/src/repr/symbol/version_script_parser_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "version_script_parser.h"
+#include "repr/symbol/version_script_parser.h"
 
 #include <gtest/gtest.h>
 
diff --git a/vndk/tools/header-checker/header-abi-util/src/api_level.cpp b/vndk/tools/header-checker/src/utils/api_level.cpp
index dc0b21683..450122fb5 100644
--- a/vndk/tools/header-checker/header-abi-util/src/api_level.cpp
+++ b/vndk/tools/header-checker/src/utils/api_level.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "api_level.h"
+#include "utils/api_level.h"
 
-#include "string_utils.h"
+#include "utils/string_utils.h"
 
 #include <cassert>
 #include <string>
diff --git a/vndk/tools/header-checker/header-abi-util/include/api_level.h b/vndk/tools/header-checker/src/utils/api_level.h
index 11bcb66dc..11bcb66dc 100644
--- a/vndk/tools/header-checker/header-abi-util/include/api_level.h
+++ b/vndk/tools/header-checker/src/utils/api_level.h
diff --git a/vndk/tools/header-checker/header-abi-util/src/api_level_test.cpp b/vndk/tools/header-checker/src/utils/api_level_test.cpp
index 3f6008cfe..138908dd7 100644
--- a/vndk/tools/header-checker/header-abi-util/src/api_level_test.cpp
+++ b/vndk/tools/header-checker/src/utils/api_level_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "api_level.h"
+#include "utils/api_level.h"
 
 #include <gtest/gtest.h>
 
diff --git a/vndk/tools/header-checker/header-abi-util/src/collect_exported_headers.cpp b/vndk/tools/header-checker/src/utils/collect_exported_headers.cpp
index 0b6b07978..01e74d7e0 100644
--- a/vndk/tools/header-checker/header-abi-util/src/collect_exported_headers.cpp
+++ b/vndk/tools/header-checker/src/utils/collect_exported_headers.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "header_abi_util.h"
+#include "utils/header_abi_util.h"
 
 #include <llvm/Support/FileSystem.h>
 #include <llvm/Support/Path.h>
@@ -22,6 +22,7 @@
 #include <string>
 #include <vector>
 
+
 namespace abi_util {
 
 static bool ShouldSkipFile(llvm::StringRef &file_name) {
diff --git a/vndk/tools/header-checker/header-abi-util/include/header_abi_util.h b/vndk/tools/header-checker/src/utils/header_abi_util.h
index aa55dad76..e76dbdadb 100644
--- a/vndk/tools/header-checker/header-abi-util/include/header_abi_util.h
+++ b/vndk/tools/header-checker/src/utils/header_abi_util.h
@@ -15,14 +15,13 @@
 #ifndef HEADER_ABI_UTIL_H_
 #define HEADER_ABI_UTIL_H_
 
-#include "ir_representation.h"
-
 #include <map>
 #include <regex>
 #include <set>
 #include <string>
 #include <vector>
 
+
 namespace abi_util {
 
 std::string RealPath(const std::string &path);
diff --git a/vndk/tools/header-checker/header-abi-util/include/stl_utils.h b/vndk/tools/header-checker/src/utils/stl_utils.h
index 3a520adb1..3a520adb1 100644
--- a/vndk/tools/header-checker/header-abi-util/include/stl_utils.h
+++ b/vndk/tools/header-checker/src/utils/stl_utils.h
diff --git a/vndk/tools/header-checker/header-abi-util/src/string_utils.cpp b/vndk/tools/header-checker/src/utils/string_utils.cpp
index b6a03d04e..a1055590e 100644
--- a/vndk/tools/header-checker/header-abi-util/src/string_utils.cpp
+++ b/vndk/tools/header-checker/src/utils/string_utils.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "string_utils.h"
+#include "utils/string_utils.h"
 
 #include <cstdlib>
 #include <string>
diff --git a/vndk/tools/header-checker/header-abi-util/include/string_utils.h b/vndk/tools/header-checker/src/utils/string_utils.h
index d222a435f..d222a435f 100644
--- a/vndk/tools/header-checker/header-abi-util/include/string_utils.h
+++ b/vndk/tools/header-checker/src/utils/string_utils.h
diff --git a/vndk/tools/header-checker/header-abi-util/src/string_utils_test.cpp b/vndk/tools/header-checker/src/utils/string_utils_test.cpp
index 7cc2bff31..3e5346fb6 100644
--- a/vndk/tools/header-checker/header-abi-util/src/string_utils_test.cpp
+++ b/vndk/tools/header-checker/src/utils/string_utils_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "string_utils.h"
+#include "utils/string_utils.h"
 
 #include <gtest/gtest.h>