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

Commit 1d584de3 authored by Justin Yun's avatar Justin Yun
Browse files

vendor_file_contexts is required only with vendor symlinks 

If devices do not include vendor symlinks, the system image does not
need to include vendor_file_contexts. Add this only if the vendor
symlinks are installed.

Bug: 410431879
Test: lunch aosp_arm64-trunk_staging-userdebug && m
Change-Id: Ia8295569f257293435ce2f2ca7bd294739837a0c
parent 7eb5ea13

target/product/generic/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -464,7 +464,10 @@ soong_config_module_type { 
    module_type: "android_filesystem_defaults",

    config_namespace: "ANDROID",

    bool_variables: ["TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS"],

    properties: ["symlinks"],

    properties: [

        "symlinks",

        "file_contexts",

    ],

}



genrule {
@@ -487,12 +490,13 @@ system_image_defaults { 
    soong_config_variables: {

        TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS: {

            symlinks: generic_symlinks + extra_vendor_symlinks,

            file_contexts: ":plat_and_vendor_file_contexts",

            conditions_default: {

                symlinks: generic_symlinks,

                file_contexts: ":plat_file_contexts",

            },

        },

    },

    file_contexts: ":plat_and_vendor_file_contexts",

    linker_config: {

        gen_linker_config: true,

        linker_config_srcs: [":system_linker_config_json_file"],