update kernel config suffix to .config
The kernel configs are changing their naming scheme to use
a suffix of ".config" rather than ".cfg".
Test: build and boot
Bug: 111762107
Change-Id: I590bccb6150d07795d84b12b588faa5e51138605
diff --git a/AssembleVintf.cpp b/AssembleVintf.cpp
index a3049ab..ea8c9b3 100644
--- a/AssembleVintf.cpp
+++ b/AssembleVintf.cpp
@@ -39,8 +39,8 @@
namespace vintf {
static const std::string gConfigPrefix = "android-base-";
-static const std::string gConfigSuffix = ".cfg";
-static const std::string gBaseConfig = "android-base.cfg";
+static const std::string gConfigSuffix = ".config";
+static const std::string gBaseConfig = "android-base.config";
// An input stream with a name.
// The input stream may be an actual file, or a stringstream for testing.
@@ -193,7 +193,8 @@
}
std::cerr << "'" << fname << "' (in " << path
<< ") is not a valid kernel config file name. Must match regex: "
- << "android-base(-[0-9a-zA-Z-]+)?\\.cfg" << std::endl;
+ << "android-base(-[0-9a-zA-Z-]+)?\\" << gConfigSuffix
+ << std::endl;
return nullptr;
}
sub.insert(0, "CONFIG_");
@@ -250,7 +251,7 @@
}
if (!foundCommonConfig) {
- std::cerr << "No android-base.cfg is found in these paths:" << std::endl;
+ std::cerr << "No " << gBaseConfig << " is found in these paths:" << std::endl;
for (auto& namedStream : *streams) {
std::cerr << " " << namedStream.name() << std::endl;
}