idmap2: fix cpplint warnings
Bug: 189963636
Test: frameworks/base/cmds/idmap2/static-checks.sh
Change-Id: I6da18cdbbd2fc33db711696445230a9f316dc143
diff --git a/cmds/idmap2/CPPLINT.cfg b/cmds/idmap2/CPPLINT.cfg
index 20ed43c..eada694 100644
--- a/cmds/idmap2/CPPLINT.cfg
+++ b/cmds/idmap2/CPPLINT.cfg
@@ -15,4 +15,4 @@
set noparent
linelength=100
root=..
-filter=+build/include_alpha,-runtime/references,-build/c++
+filter=+build/include_alpha,-runtime/references,-build/c++,-build/include_alpha
diff --git a/cmds/idmap2/idmap2/CommandUtils.cpp b/cmds/idmap2/idmap2/CommandUtils.cpp
index bf30a76..63235ff 100644
--- a/cmds/idmap2/idmap2/CommandUtils.cpp
+++ b/cmds/idmap2/idmap2/CommandUtils.cpp
@@ -19,6 +19,7 @@
#include <string>
#include <vector>
+#include "idmap2/CommandUtils.h"
#include "idmap2/Idmap.h"
#include "idmap2/Result.h"
#include "idmap2/SysTrace.h"
diff --git a/cmds/idmap2/idmap2/CommandUtils.h b/cmds/idmap2/idmap2/CommandUtils.h
index e068967..341fec8 100644
--- a/cmds/idmap2/idmap2/CommandUtils.h
+++ b/cmds/idmap2/idmap2/CommandUtils.h
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-#ifndef IDMAP2_IDMAP2_COMMAND_UTILS_H_
-#define IDMAP2_IDMAP2_COMMAND_UTILS_H_
+#ifndef IDMAP2_IDMAP2_COMMANDUTILS_H_
+#define IDMAP2_IDMAP2_COMMANDUTILS_H_
+
+#include <string>
#include "idmap2/PolicyUtils.h"
#include "idmap2/Result.h"
@@ -24,4 +26,4 @@
const std::string& idmap_path, const std::string& target_path, const std::string& overlay_path,
const std::string& overlay_name, PolicyBitmask fulfilled_policies, bool enforce_overlayable);
-#endif // IDMAP2_IDMAP2_COMMAND_UTILS_H_
+#endif // IDMAP2_IDMAP2_COMMANDUTILS_H_
diff --git a/cmds/idmap2/idmap2/Create.cpp b/cmds/idmap2/idmap2/Create.cpp
index 977a0bb..d5f1b89 100644
--- a/cmds/idmap2/idmap2/Create.cpp
+++ b/cmds/idmap2/idmap2/Create.cpp
@@ -20,6 +20,7 @@
#include <fstream>
#include <memory>
#include <ostream>
+#include <string>
#include <vector>
#include "androidfw/ResourceTypes.h"
diff --git a/cmds/idmap2/idmap2d/Idmap2Service.cpp b/cmds/idmap2/idmap2d/Idmap2Service.cpp
index 73a7240..2cfbac3 100644
--- a/cmds/idmap2/idmap2d/Idmap2Service.cpp
+++ b/cmds/idmap2/idmap2d/Idmap2Service.cpp
@@ -26,6 +26,8 @@
#include <memory>
#include <ostream>
#include <string>
+#include <utility>
+#include <vector>
#include "android-base/macros.h"
#include "android-base/stringprintf.h"
diff --git a/cmds/idmap2/idmap2d/Idmap2Service.h b/cmds/idmap2/idmap2d/Idmap2Service.h
index 40843f7..c16c3c5 100644
--- a/cmds/idmap2/idmap2d/Idmap2Service.h
+++ b/cmds/idmap2/idmap2d/Idmap2Service.h
@@ -24,7 +24,9 @@
#include <idmap2/ResourceContainer.h>
#include <idmap2/Result.h>
+#include <memory>
#include <string>
+#include <vector>
namespace android::os {
diff --git a/cmds/idmap2/include/idmap2/FabricatedOverlay.h b/cmds/idmap2/include/idmap2/FabricatedOverlay.h
index be687d9..3756718 100644
--- a/cmds/idmap2/include/idmap2/FabricatedOverlay.h
+++ b/cmds/idmap2/include/idmap2/FabricatedOverlay.h
@@ -14,15 +14,17 @@
* limitations under the License.
*/
-#ifndef IDMAP2_INCLUDE_IDMAP2_FABRICATEDOVERLAY_H
-#define IDMAP2_INCLUDE_IDMAP2_FABRICATEDOVERLAY_H
+#ifndef IDMAP2_INCLUDE_IDMAP2_FABRICATEDOVERLAY_H_
+#define IDMAP2_INCLUDE_IDMAP2_FABRICATEDOVERLAY_H_
#include <libidmap2/proto/fabricated_v1.pb.h>
#include <iostream>
#include <map>
#include <memory>
+#include <string>
#include <unordered_map>
+#include <vector>
#include "idmap2/ResourceContainer.h"
#include "idmap2/Result.h"
@@ -68,7 +70,8 @@
Result<SerializedData*> InitializeData() const;
Result<uint32_t> GetCrc() const;
- FabricatedOverlay(pb::FabricatedOverlay&& overlay, std::optional<uint32_t> crc_from_disk = {});
+ explicit FabricatedOverlay(pb::FabricatedOverlay&& overlay,
+ std::optional<uint32_t> crc_from_disk = {});
pb::FabricatedOverlay overlay_pb_;
std::optional<uint32_t> crc_from_disk_;
@@ -102,4 +105,4 @@
} // namespace android::idmap2
-#endif // IDMAP2_INCLUDE_IDMAP2_FABRICATEDOVERLAY_H
+#endif // IDMAP2_INCLUDE_IDMAP2_FABRICATEDOVERLAY_H_
diff --git a/cmds/idmap2/include/idmap2/ResourceContainer.h b/cmds/idmap2/include/idmap2/ResourceContainer.h
index 74a6f56..c3ba464 100644
--- a/cmds/idmap2/include/idmap2/ResourceContainer.h
+++ b/cmds/idmap2/include/idmap2/ResourceContainer.h
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#ifndef IDMAP2_INCLUDE_IDMAP2_RESOURCECONTAINER_H
-#define IDMAP2_INCLUDE_IDMAP2_RESOURCECONTAINER_H
+#ifndef IDMAP2_INCLUDE_IDMAP2_RESOURCECONTAINER_H_
+#define IDMAP2_INCLUDE_IDMAP2_RESOURCECONTAINER_H_
+#include <memory>
#include <string>
#include <variant>
#include <vector>
@@ -103,4 +104,4 @@
} // namespace android::idmap2
-#endif // IDMAP2_INCLUDE_IDMAP2_RESOURCECONTAINER_H
+#endif // IDMAP2_INCLUDE_IDMAP2_RESOURCECONTAINER_H_
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
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"
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"
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
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"
diff --git a/cmds/idmap2/tests/FabricatedOverlayTests.cpp b/cmds/idmap2/tests/FabricatedOverlayTests.cpp
index 79ab243..468ea0c 100644
--- a/cmds/idmap2/tests/FabricatedOverlayTests.cpp
+++ b/cmds/idmap2/tests/FabricatedOverlayTests.cpp
@@ -19,6 +19,7 @@
#include <idmap2/FabricatedOverlay.h>
#include <fstream>
+#include <utility>
namespace android::idmap2 {
@@ -135,4 +136,4 @@
EXPECT_EQ(Res_value::TYPE_INT_DEC, entry->data_type);
}
-} // namespace android::idmap2
\ No newline at end of file
+} // namespace android::idmap2
diff --git a/cmds/idmap2/tests/IdmapTests.cpp b/cmds/idmap2/tests/IdmapTests.cpp
index 9516ff8..9c6402a 100644
--- a/cmds/idmap2/tests/IdmapTests.cpp
+++ b/cmds/idmap2/tests/IdmapTests.cpp
@@ -83,7 +83,7 @@
std::stringstream stream;
stream << android::kIdmapMagic;
stream << 0xffffffffU;
- stream << std::string(kJunkSize, (char)0xffU);
+ stream << std::string(kJunkSize, static_cast<char>(0xffU));
ASSERT_FALSE(Idmap::FromBinaryStream(stream));
}
@@ -92,7 +92,7 @@
std::stringstream stream;
stream << 0xffffffffU;
stream << android::kIdmapCurrentVersion;
- stream << std::string(kJunkSize, (char)0xffU);
+ stream << std::string(kJunkSize, static_cast<char>(0xffU));
ASSERT_FALSE(Idmap::FromBinaryStream(stream));
}
diff --git a/cmds/idmap2/tests/R.h b/cmds/idmap2/tests/R.h
index ac9b058..89219c9 100644
--- a/cmds/idmap2/tests/R.h
+++ b/cmds/idmap2/tests/R.h
@@ -66,8 +66,8 @@
constexpr ResourceId str1 = 0x7f02000b;
constexpr ResourceId str3 = 0x7f02000c;
constexpr ResourceId str4 = 0x7f02000d;
- }
-}
+ } // namespace string
+} // namespace R::overlay
// clang-format on
} // namespace android::idmap2
