Add missing headers.
Protobuf 22.x no longer transitively includes these, so they
need to be included explicitly.
Bug: 329747255
Test: presubmit
Change-Id: I2144d5625e687cc45c22a97997cce9f65c8c9874
diff --git a/derive_classpath/derive_classpath.cpp b/derive_classpath/derive_classpath.cpp
index fba63f7..1de47a7 100644
--- a/derive_classpath/derive_classpath.cpp
+++ b/derive_classpath/derive_classpath.cpp
@@ -25,6 +25,7 @@
#include <glob.h>
#include <regex>
#include <sstream>
+#include <unordered_map>
#include "packages/modules/common/proto/classpaths.pb.h"
diff --git a/derive_classpath/derive_classpath_test.cpp b/derive_classpath/derive_classpath_test.cpp
index 0dd1a64..b233825 100644
--- a/derive_classpath/derive_classpath_test.cpp
+++ b/derive_classpath/derive_classpath_test.cpp
@@ -541,5 +541,7 @@
int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
+ // Required for EXPECT_DEATH to work correctly
+ android::base::SetLogger(android::base::StderrLogger);
return RUN_ALL_TESTS();
}
diff --git a/derive_sdk/derive_sdk.cpp b/derive_sdk/derive_sdk.cpp
index 936a36a..698e6e3 100644
--- a/derive_sdk/derive_sdk.cpp
+++ b/derive_sdk/derive_sdk.cpp
@@ -27,6 +27,9 @@
#include <algorithm>
#include <iostream>
+#include <map>
+#include <unordered_map>
+#include <unordered_set>
#include <vector>
#include "packages/modules/common/proto/sdk.pb.h"
diff --git a/derive_sdk/derive_sdk_test.cpp b/derive_sdk/derive_sdk_test.cpp
index 74663fb..89dd740 100644
--- a/derive_sdk/derive_sdk_test.cpp
+++ b/derive_sdk/derive_sdk_test.cpp
@@ -27,6 +27,8 @@
#include <sys/stat.h>
#include <cstdlib>
+#include <string>
+#include <unordered_map>
#include "packages/modules/common/proto/sdk.pb.h"
