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

Commit 358f4ce7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I05e30dcd,Ia8295569 into main 

* changes:
  Remove vendor symlinks from the root directory
  vendor_file_contexts is required only with vendor symlinks
parents 729d356f cd5ed7ac

target/board/generic_arm64/BoardConfig.mk

+0 −7
Original line number Diff line number Diff line
@@ -62,13 +62,6 @@ include build/make/target/board/BoardConfigGsiCommon.mk 
# Some vendors still haven't cleaned up all device specific directories under

# root!



# TODO(b/111434759, b/111287060) SoC specific hacks

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp

BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware

# for Android.bp

TARGET_ADD_ROOT_EXTRA_VENDOR_SYMLINKS := true



# TODO(b/36764215): remove this setting when the generic system image

# no longer has QCOM-specific directories under /.

BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy

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"],