commit 1195a6bd465872639c9a7b83518affc1b1fcf485
author Mårten Kongstad <marten.kongstad@volvocars.com> Tue May 11 12:57:01 2021 +0000
committer Ryan Mitchell <rtmitchell@google.com> Wed Jun 02 21:55:28 2021 +0000
tree 7a6067a5514207c8f291d031f318f4b2df7215b8
parent 99ae898d3cc484de91bd8df6c93514c25f0b0dce

idmap2: fix cpplint warnings

Bug: 189963636
Test: frameworks/base/cmds/idmap2/static-checks.sh
Change-Id: I6da18cdbbd2fc33db711696445230a9f316dc143

cmds/idmap2/libidmap2/FabricatedOverlay.cpp

diff --git a/cmds/idmap2/libidmap2/FabricatedOverlay.cpp b/cmds/idmap2/libidmap2/FabricatedOverlay.cpp
index 4f61801..8352dbb 100644
--- a/cmds/idmap2/libidmap2/FabricatedOverlay.cpp
+++ b/cmds/idmap2/libidmap2/FabricatedOverlay.cpp
@@ -23,6 +23,10 @@
 #include <zlib.h>
 
 #include <fstream>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
 
 namespace android::idmap2 {
 
@@ -89,7 +93,7 @@
     auto package = entries.find(package_name);
     if (package == entries.end()) {
       package = entries
-                    .insert(std::make_pair<>(
+                    .insert(std::make_pair(
                         package_name, std::map<std::string, std::map<std::string, TargetValue>>()))
                     .first;
     }
@@ -98,13 +102,13 @@
     if (type == package->second.end()) {
       type =
           package->second
-              .insert(std::make_pair<>(type_name.to_string(), std::map<std::string, TargetValue>()))
+              .insert(std::make_pair(type_name.to_string(), std::map<std::string, TargetValue>()))
               .first;
     }
 
     auto entry = type->second.find(entry_name.to_string());
     if (entry == type->second.end()) {
-      entry = type->second.insert(std::make_pair<>(entry_name.to_string(), TargetValue())).first;
+      entry = type->second.insert(std::make_pair(entry_name.to_string(), TargetValue())).first;
     }
 
     entry->second = TargetValue{res_entry.data_type, res_entry.data_value};
@@ -299,4 +303,4 @@
   return Error("Fabricated overlay does not contain resources.");
 }
 
-}  // namespace android::idmap2
\ No newline at end of file
+}  // namespace android::idmap2

cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp

diff --git a/cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp b/cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp
index 721612c..d10a278 100644
--- a/cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp
+++ b/cmds/idmap2/libidmap2/PrettyPrintVisitor.cpp
@@ -18,6 +18,7 @@
 
 #include <istream>
 #include <string>
+#include <utility>
 
 #include "android-base/macros.h"
 #include "android-base/stringprintf.h"

cmds/idmap2/libidmap2/RawPrintVisitor.cpp

diff --git a/cmds/idmap2/libidmap2/RawPrintVisitor.cpp b/cmds/idmap2/libidmap2/RawPrintVisitor.cpp
index a016a36..779538c 100644
--- a/cmds/idmap2/libidmap2/RawPrintVisitor.cpp
+++ b/cmds/idmap2/libidmap2/RawPrintVisitor.cpp
@@ -18,6 +18,8 @@
 
 #include <algorithm>
 #include <cstdarg>
+#include <string>
+#include <utility>
 
 #include "android-base/macros.h"
 #include "android-base/stringprintf.h"

cmds/idmap2/libidmap2/ResourceContainer.cpp

diff --git a/cmds/idmap2/libidmap2/ResourceContainer.cpp b/cmds/idmap2/libidmap2/ResourceContainer.cpp
index 9147cca..d11334d 100644
--- a/cmds/idmap2/libidmap2/ResourceContainer.cpp
+++ b/cmds/idmap2/libidmap2/ResourceContainer.cpp
@@ -16,6 +16,11 @@
 
 #include "idmap2/ResourceContainer.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "androidfw/ApkAssets.h"
 #include "androidfw/AssetManager.h"
 #include "androidfw/Util.h"
@@ -445,4 +450,4 @@
   return std::unique_ptr<OverlayResourceContainer>(result->release());
 }
 
-}  // namespace android::idmap2
\ No newline at end of file
+}  // namespace android::idmap2

cmds/idmap2/libidmap2/ResourceUtils.cpp

diff --git a/cmds/idmap2/libidmap2/ResourceUtils.cpp b/cmds/idmap2/libidmap2/ResourceUtils.cpp
index e809bf1..32c04d2 100644
--- a/cmds/idmap2/libidmap2/ResourceUtils.cpp
+++ b/cmds/idmap2/libidmap2/ResourceUtils.cpp
@@ -17,6 +17,7 @@
 #include "idmap2/ResourceUtils.h"
 
 #include <memory>
+#include <string>
 
 #include "androidfw/StringPiece.h"
 #include "androidfw/Util.h"