update kernel config suffix to .config am: ad6aa914d5 am: c5a3730a17
am: 71556635d0
Change-Id: I879f8438a00209498993fdc8ed599ae9e00d1ab5
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;
}
diff --git a/assemble_vintf_main.cpp b/assemble_vintf_main.cpp
index e4f3d6f..e84aaaf 100644
--- a/assemble_vintf_main.cpp
+++ b/assemble_vintf_main.cpp
@@ -52,12 +52,12 @@
" - VINTF_ENFORCE_NO_UNUSED_HALS =true: check unused HALs\n"
" If any check fails, an error message is written to stderr.\n"
" Return 1.\n"
- " --kernel=<version>:<android-base.cfg>[:<android-base-arch.cfg>[...]]\n"
+ " --kernel=<version>:<android-base.config>[:<android-base-arch.config>[...]]\n"
" Add a kernel entry to framework compatibility matrix.\n"
" Ignored for other input format.\n"
" <version> has format: 3.18.0\n"
- " <android-base.cfg> is the location of android-base.cfg\n"
- " <android-base-arch.cfg> is the location of an optional\n"
+ " <android-base.config> is the location of android-base.config\n"
+ " <android-base-arch.config> is the location of an optional\n"
" arch-specific config fragment, more than one may be specified\n"
" -l, --hals-only\n"
" Output has only <hal> entries. Cannot be used with -n.\n"
diff --git a/test/AssembleVintfTest.cpp b/test/AssembleVintfTest.cpp
index d6a73be..3c134cc 100644
--- a/test/AssembleVintfTest.cpp
+++ b/test/AssembleVintfTest.cpp
@@ -79,12 +79,12 @@
{"PLATFORM_SEPOLICY_VERSION", "10000.0"},
{"FRAMEWORK_VBMETA_VERSION", "1.0"},
});
- getInstance()->addKernelConfigInputStream({3, 18, 0}, "android-base.cfg",
+ getInstance()->addKernelConfigInputStream({3, 18, 0}, "android-base.config",
makeStream(kernel318));
- getInstance()->addKernelConfigInputStream({3, 18, 0}, "android-base-arm64.cfg",
+ getInstance()->addKernelConfigInputStream({3, 18, 0}, "android-base-arm64.config",
makeStream(kernel318_64));
- getInstance()->addKernelConfigInputStream({4, 4, 0}, "android-base.cfg", makeStream(kernel44));
- getInstance()->addKernelConfigInputStream({4, 4, 0}, "android-base-arm64.cfg",
+ getInstance()->addKernelConfigInputStream({4, 4, 0}, "android-base.config", makeStream(kernel44));
+ getInstance()->addKernelConfigInputStream({4, 4, 0}, "android-base-arm64.config",
makeStream(kernel44_64));
EXPECT_TRUE(getInstance()->assemble());
diff --git a/test/LibVintfTest.cpp b/test/LibVintfTest.cpp
index 0aa705f..b67d5ed 100644
--- a/test/LibVintfTest.cpp
+++ b/test/LibVintfTest.cpp
@@ -1502,7 +1502,7 @@
}
TEST_F(LibVintfTest, KernelConfigParser2) {
- // usage in android-base.cfg
+ // usage in android-base.config
const std::string data =
"# CONFIG_NOT_SET is not set\n"
"CONFIG_ONE=1\n"
@@ -1522,7 +1522,7 @@
}
TEST_F(LibVintfTest, KernelConfigParserSpace) {
- // usage in android-base.cfg
+ // usage in android-base.config
const std::string data =
" # CONFIG_NOT_SET is not set \n"
" CONFIG_ONE=1 # 'tis a one!\n"
