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

Commit fbdde170 authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Fix android_gsi dirs and symlinks" into main am: 7089890f 

Original change: https://android-review.googlesource.com/c/platform/build/+/3364087



Change-Id: I26375d1d6918da64c548aaa553884922eb4149a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ae56574 7089890f

target/product/generic/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -55,10 +55,6 @@ generic_symlinks = [ 
        target: "/data/user_de/0/com.android.shell/files/bugreports",

        name: "bugreports",

    },

    {

        target: "/data/cache",

        name: "cache",

    },

    {

        target: "/sys/kernel/debug",

        name: "d",
@@ -125,6 +121,10 @@ android_symlinks = [ 
        target: "/system_ext",

        name: "system/system_ext",

    },

    {

        target: "/data/cache",

        name: "cache",

    },

]



filegroup {

target/product/gsi/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -71,12 +71,21 @@ gsi_symlinks = [ 
        target: "/system/product",

        name: "product",

    },

    {

        target: "/odm/odm_dlkm/etc",

        name: "odm_dlkm/etc",

    },

    {

        target: "/vendor/vendor_dlkm/etc",

        name: "vendor_dlkm/etc",

    },

]



android_system_image {

    name: "android_gsi",

    defaults: ["system_image_defaults"],

    symlinks: gsi_symlinks,

    dirs: ["cache"],

    deps: [

        ///////////////////////////////////////////

        // gsi_system_ext