commit afc55a8ac223ca90604b729e371af54855b564bb
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 27 23:15:15 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 27 23:15:15 2020 +0000
tree 342e973384f03266456e8636b35ff879a7270ce1
parent 575d2c05f55e00ed7d30b42b19451e87a7015693
parent f765c0d282c7b48154bc16f6db6bdc64781f3b3d

Merge "Update code generator for RSStubsWhiteList"

script_api/GenerateStubsWhiteList.cpp

diff --git a/script_api/GenerateStubsWhiteList.cpp b/script_api/GenerateStubsWhiteList.cpp
index 5caecd5..1c98adf 100644
--- a/script_api/GenerateStubsWhiteList.cpp
+++ b/script_api/GenerateStubsWhiteList.cpp
@@ -416,11 +416,25 @@
 
         file.writeNotices();
         file << "#include \"RSStubsWhiteList.h\"\n\n";
-        file << "std::vector<std::string> stubList = {\n";
+        file << "std::array<std::string_view, " << allManglings.size() << "> stubList = {\n";
         for (const auto& e : allManglings) {
             file << "\"" << e << "\",\n";
         }
         file << "};\n";
+
+        GeneratedFile header;
+        if (!header.start(".", "RSStubsWhiteList.h")) {
+            return false;
+        }
+
+        header.writeNotices();
+        header << "#ifndef RSStubsWhiteList_H\n";
+        header << "#define RSStubsWhiteList_H\n\n";
+        header << "#include <cstdlib>\n";
+        header << "#include <array>\n";
+        header << "#include <string_view>\n\n";
+        header << "extern std::array<std::string_view, " << allManglings.size() << "> stubList;\n\n";
+        header << "#endif // RSStubsWhiteList_H\n";
     }
     return success;
 }

script_api/generate.sh

diff --git a/script_api/generate.sh b/script_api/generate.sh
index 1a7fe34..9b14ee5 100755
--- a/script_api/generate.sh
+++ b/script_api/generate.sh
@@ -64,4 +64,4 @@
 rm -rf slangtest
 
 mv RSStubsWhiteList.cpp ../../compile/libbcc/lib/
-
+mv RSStubsWhiteList.h ../../compile/libbcc/lib/