commit 1f6bb7801c0421562d430ddc94df18ec16d26fc4
author Nikita Ioffe <ioffe@google.com> Mon Mar 02 18:01:54 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 02 18:01:54 2020 +0000
tree 298818e25af432b4f603d20b6ba31d6c9874e768
parent 1b359a27a649f42f82e7d89ee35e50f5d705ac28
parent 03594fa902f914eb55be144f4339a2564985151a

Merge "Reset post_data_ and services_update_finished_ on userspace reboot" into rvc-dev

liblog/Android.bp

diff --git a/liblog/Android.bp b/liblog/Android.bp
index 7f183c2..f1e5118 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -101,11 +101,6 @@
         versions: ["29", "30"],
     },
 
-    // TODO(tomcherry): Renable this before release branch is cut
-    header_abi_checker: {
-        enabled: false,
-    },
-
     cflags: [
         "-Wall",
         "-Werror",

logwrapper/logwrap.cpp

diff --git a/logwrapper/logwrap.cpp b/logwrapper/logwrap.cpp
index 5337801..5a518bc 100644
--- a/logwrapper/logwrap.cpp
+++ b/logwrapper/logwrap.cpp
@@ -374,7 +374,7 @@
     }
 
     if (log_target & LOG_FILE) {
-        fd = open(file_path, O_WRONLY | O_CREAT, 0664);
+        fd = open(file_path, O_WRONLY | O_CREAT | O_CLOEXEC, 0664);
         if (fd < 0) {
             ERROR("Cannot log to file %s\n", file_path);
             log_target &= ~LOG_FILE;