commit 6d8304aa469b76d487e027cb1cf7ea1e18784dbc
author Nate Myren <ntmyren@google.com> Wed May 01 19:19:53 2024 +0000
committer Nate Myren <ntmyren@google.com> Wed May 01 19:21:49 2024 +0000
tree 54969bbf408460a07f3899ed519d1c8626acc487
parent 32677ae8f3c93d29ac9ed94be26f8368c0dec0da

Revert "Only write appcompat properties if flag is defined"

Revert submission 3049635-cherrypicker-L52500030003287943:N44300030053199935

Reason for revert: b/338244859
Bug: 338244859

Reverted changes: /q/submissionid:3049635-cherrypicker-L52500030003287943:N44300030053199935

Change-Id: I4b99429ce5df0af30e6ad99d3463d4dc2c96c012

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index c4e74d0..6d63e41 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -96,7 +96,6 @@
     config_namespace: "ANDROID",
     bool_variables: [
         "PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT",
-        "release_write_appcompat_override_system_properties",
     ],
     properties: [
         "cflags",
@@ -160,9 +159,6 @@
                 "-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 5a1b63b..58a0a7f 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1308,14 +1308,12 @@
     }
     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() {