commit cdd4cb7db86d4cd89319d83da347744aac252717
author Nate Myren <ntmyren@google.com> Fri May 31 01:31:38 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 31 01:31:38 2024 +0000
tree 21fb77b61a1b1c5add518e68bb62c5a11a1506ea
parent 276eabe757cce9ea5f486eec1009e013d41adc81
parent b9e0545c855634897be33e71f6ecaa3794890c6c

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

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 6160a71..dd1f9aa 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -96,6 +96,7 @@
     config_namespace: "ANDROID",
     bool_variables: [
         "PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT",
+        "release_write_appcompat_override_system_properties",
     ],
     properties: [
         "cflags",
@@ -159,6 +160,9 @@
                 "-DINSTALL_DEBUG_POLICY_TO_SYSTEM_EXT=1",
             ],
         },
+        release_write_appcompat_override_system_properties: {
+            cflags: ["-DWRITE_APPCOMPAT_OVERRIDE_SYSTEM_PROPERTIES"],
+        }
     },
     static_libs: [
         "libavb",

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index cd5933d..0d6eb15 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1323,12 +1323,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() {