commit ddfe72cda0a854bebf01c3f7e6c841611a25b557
author Tom Cherry <tomcherry@google.com> Thu Jun 24 21:58:31 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 24 21:58:31 2021 +0000
tree 0a9f22e4935db00accb9b29510b777e7e537fa86
parent 0057412b025e23fc3954fc04b8bc24f1c0062ff5
parent da4752eb9e7c96b53da54105fd355a5173561a0b

Merge "logd: replay the entire log when UID clearing"

liblog/tests/logprint_test.cpp

diff --git a/liblog/tests/logprint_test.cpp b/liblog/tests/logprint_test.cpp
index 72e53f9..e13934d 100644
--- a/liblog/tests/logprint_test.cpp
+++ b/liblog/tests/logprint_test.cpp
@@ -29,7 +29,7 @@
   auto output_size = convertPrintable(nullptr, input, strlen(input));
   EXPECT_EQ(output_size, strlen(input));
 
-  char output[output_size];
+  char output[output_size + 1];
 
   output_size = convertPrintable(output, input, strlen(input));
   EXPECT_EQ(output_size, strlen(input));
@@ -43,7 +43,7 @@
   auto output_size = convertPrintable(nullptr, input, strlen(input));
   EXPECT_EQ(output_size, strlen(expected_output));
 
-  char output[output_size];
+  char output[output_size + 1];
 
   output_size = convertPrintable(output, input, strlen(input));
   EXPECT_EQ(output_size, strlen(expected_output));
@@ -55,7 +55,7 @@
   auto output_size = convertPrintable(nullptr, input, strlen(input));
   EXPECT_EQ(output_size, strlen(input));
 
-  char output[output_size];
+  char output[output_size + 1];
 
   output_size = convertPrintable(output, input, strlen(input));
   EXPECT_EQ(output_size, strlen(input));
@@ -69,7 +69,7 @@
   auto output_size = convertPrintable(nullptr, input, strlen(input));
   EXPECT_EQ(output_size, strlen(expected_output));
 
-  char output[output_size];
+  char output[output_size + 1];
 
   output_size = convertPrintable(output, input, strlen(input));
   EXPECT_EQ(output_size, strlen(expected_output));
@@ -85,7 +85,7 @@
   auto output_size = convertPrintable(nullptr, input, strlen(input));
   EXPECT_EQ(output_size, strlen(expected_output));
 
-  char output[output_size];
+  char output[output_size + 1];
 
   output_size = convertPrintable(output, input, strlen(input));
   EXPECT_EQ(output_size, strlen(expected_output));

logwrapper/Android.bp

diff --git a/logwrapper/Android.bp b/logwrapper/Android.bp
index 2799947..22c7fdd 100644
--- a/logwrapper/Android.bp
+++ b/logwrapper/Android.bp
@@ -28,6 +28,7 @@
 cc_library {
     name: "liblogwrap",
     defaults: ["logwrapper_defaults"],
+    ramdisk_available: true,
     recovery_available: true,
     srcs: ["logwrap.cpp"],
     shared_libs: [