commit 2178081cd90ebcd77c867d52a8b0e15f0d4134cc
author Steven Moreland <smoreland@google.com> Fri Sep 11 01:29:45 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 16 19:56:14 2020 +0000
tree 60121b57b0dfab00beb6ccd38826a05a0567daee
parent 40d398a0d28ad652afe1168d3abc7cd5231ae4de

Use AIDL_* errors over libbase logging.

This:
- gives us line numbers in source AIDL files reflecting errors
- makes it possible aidl_parser_fuzzer can detect when we return an
  error but don't provide any output logging

Bug: N/A
Test: aidl_unittest
Change-Id: I0479fd8d87547c1f0b1be754f9b8f6865db3cbef

aidl_to_ndk.cpp

diff --git a/aidl_to_ndk.cpp b/aidl_to_ndk.cpp
index abf54ac..3664e77 100644
--- a/aidl_to_ndk.cpp
+++ b/aidl_to_ndk.cpp
@@ -181,7 +181,7 @@
       {"long", "Int64"},
   };
   auto aparcel_name_it = kAParcelTypeNameMap.find(enum_decl.GetBackingType().GetName());
-  CHECK(aparcel_name_it != kAParcelTypeNameMap.end());
+  AIDL_FATAL_IF(aparcel_name_it == kAParcelTypeNameMap.end(), enum_decl);
   const std::string aparcel_name = aparcel_name_it->second;
 
   const std::string backing_type_name =
@@ -325,7 +325,7 @@
 };
 
 static TypeInfo::Aspect GetTypeAspect(const AidlTypenames& types, const AidlTypeSpecifier& aidl) {
-  CHECK(aidl.IsResolved()) << aidl.ToString();
+  AIDL_FATAL_IF(!aidl.IsResolved(), aidl) << aidl.ToString();
   auto& aidl_name = aidl.GetName();
 
   TypeInfo info;
@@ -350,7 +350,7 @@
 
   if (AidlTypenames::IsBuiltinTypename(aidl_name)) {
     auto it = kNdkTypeInfoMap.find(aidl_name);
-    CHECK(it != kNdkTypeInfoMap.end());
+    AIDL_FATAL_IF(it == kNdkTypeInfoMap.end(), aidl_name);
     info = it->second;
   } else {
     const AidlDefinedType* type = types.TryGetDefinedType(aidl_name);