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

Commit b46dcf4f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents ef3679a7 32677ae8

init/Android.bp

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

    bool_variables: [

        "PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT",

        "release_write_appcompat_override_system_properties",

    ],

    properties: [

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

+2 −0
Original line number Diff line number Diff line
@@ -1308,12 +1308,14 @@ 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() {