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

Commit 6041e114 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use ext4 for android_gsi image" into main am: d4ba6730 am: 6ae56574 

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



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

target/product/generic/Android.bp

+5 −10
Original line number Diff line number Diff line
@@ -346,11 +346,6 @@ phony { 
    ],

}



filegroup {

    name: "system_image_erofs_compress_hints.txt",

    srcs: ["erofs_compress_hints.txt"],

}



android_filesystem_defaults {

    name: "system_image_defaults",

    partition_name: "system",
@@ -374,11 +369,6 @@ android_filesystem_defaults { 
        ],

        libs: [":framework-res{.export-package.apk}"],

    },

    type: "erofs",

    erofs: {

        compressor: "lz4hc,9",

        compress_hints: ":system_image_erofs_compress_hints.txt",

    },

    build_logtags: true,

    gen_aconfig_flags_pb: true,
@@ -907,4 +897,9 @@ android_system_image { 
    defaults: ["system_image_defaults"],

    dirs: android_rootdirs,

    symlinks: android_symlinks,

    type: "erofs",

    erofs: {

        compressor: "lz4hc,9",

        compress_hints: "erofs_compress_hints.txt",

    },

}

target/product/gsi/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -196,4 +196,5 @@ android_system_image { 
        "true": true,

        default: false,

    }),

    type: "ext4",

}