commit b9e0545c855634897be33e71f6ecaa3794890c6c
author Nate Myren <ntmyren@google.com> Tue May 28 23:40:59 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 28 23:40:59 2024 +0000
tree da0b7ade785db0c160b95d9c1fcbb3f8db98b500
parent 6d8304aa469b76d487e027cb1cf7ea1e18784dbc

Revert^2 "Only write appcompat properties if flag is defined"

This reverts commit 6d8304aa469b76d487e027cb1cf7ea1e18784dbc.

Reason for revert: resubmission

Change-Id: Ifb66efa2b1b7a734302316259690950306af99ec

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 58a0a7f..5a1b63b 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1308,12 +1308,14 @@
     }
     selinux_android_restorecon(PROP_TREE_FILE, 0);
 
+#ifdef WRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES
     mkdir(APPCOMPAT_OVERRIDE_PROP_FOLDERNAME, S_IRWXU | S_IXGRP | S_IXOTH);
     if (!WriteStringToFile(serialized_contexts, APPCOMPAT_OVERRIDE_PROP_TREE_FILE, 0444, 0, 0,
                            false)) {
         PLOG(ERROR) << "Unable to write appcompat override property infos to file";
     }
     selinux_android_restorecon(APPCOMPAT_OVERRIDE_PROP_TREE_FILE, 0);
+#endif
 }
 
 static void ExportKernelBootProps() {