Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d8304aa authored by Nate Myren's avatar Nate Myren
Browse files

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
parent 32677ae8

init/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ soong_config_module_type { 
    config_namespace: "ANDROID",

    bool_variables: [

        "PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT",

        "release_write_appcompat_override_system_properties",

    ],

    properties: [

        "cflags",
@@ -160,9 +159,6 @@ libinit_cc_defaults { 
                "-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

+0 −2
Original line number Diff line number Diff line
@@ -1308,14 +1308,12 @@ void CreateSerializedPropertyInfo() { 
    }

    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() {