commit c16ff2b73bca301ba47823ca9e4cbc888388ca82
author Steven Moreland <smoreland@google.com> Wed Feb 26 17:03:37 2020 -0800
committer Steven Moreland <smoreland@google.com> Thu Feb 27 15:05:12 2020 -0800
tree b6b20b26486f2624cdf17eaffda9c435e24c2a80
parent 52d83de7d92e93afefd62f5d56e2310f305d62bf

Avoid big statics.

Allocating big statics when needed.

Bug: 150319735
Test: boot/works
Change-Id: I5dde4f473b38be8e8d99f034227abaedb3e50634

KernelConfigParser.cpp

diff --git a/KernelConfigParser.cpp b/KernelConfigParser.cpp
index 5713f22..c851716 100644
--- a/KernelConfigParser.cpp
+++ b/KernelConfigParser.cpp
@@ -21,10 +21,6 @@
 #define KEY "(CONFIG[\\w_]+)"
 #define COMMENT "(?:#.*)"
 
-static const std::regex sKeyValuePattern("^\\s*" KEY "\\s*=\\s*([^#]+)" COMMENT "?$");
-static const std::regex sNotSetPattern("^\\s*#\\s*" KEY " is not set\\s*$");
-static const std::regex sCommentPattern("^\\s*" COMMENT "$");
-
 namespace android {
 namespace vintf {
 
@@ -56,11 +52,14 @@
 }
 
 status_t KernelConfigParser::processRemaining() {
-
     if (mRemaining.empty()) {
         return OK;
     }
 
+    static const std::regex sKeyValuePattern("^\\s*" KEY "\\s*=\\s*([^#]+)" COMMENT "?$");
+    static const std::regex sNotSetPattern("^\\s*#\\s*" KEY " is not set\\s*$");
+    static const std::regex sCommentPattern("^\\s*" COMMENT "$");
+
     std::smatch match;
 
     if (mRelaxedFormat) {