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

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

Merge "Add fsverity/compos only for 64-bit images" into main

parents 80759003 c651d3cb

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER) 
$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_32_BIT_APPS,$(if $(filter true,$(TARGET_SUPPORTS_32_BIT_APPS)),true,false))

$(call soong_config_set_bool,ANDROID,TARGET_SUPPORTS_64_BIT_APPS,$(if $(filter true,$(TARGET_SUPPORTS_64_BIT_APPS)),true,false))

$(call add_soong_config_var,ANDROID,BOARD_GENFS_LABELS_VERSION)

$(call soong_config_set_bool,ANDROID,PRODUCT_FSVERITY_GENERATE_METADATA,$(if $(filter true,$(PRODUCT_FSVERITY_GENERATE_METADATA)),true,false))



$(call add_soong_config_var,ANDROID,ADDITIONAL_M4DEFS,$(if $(BOARD_SEPOLICY_M4DEFS),$(addprefix -D,$(BOARD_SEPOLICY_M4DEFS))))

target/product/generic/Android.bp

+29 −10
Original line number Diff line number Diff line
@@ -416,6 +416,19 @@ android_filesystem_defaults { 
    }),

}



system_image_fsverity_default = {

    inputs: [

        "etc/boot-image.prof",

        "etc/classpaths/*.pb",

        "etc/dirty-image-objects",

        "etc/preloaded-classes",

        "framework/*",

        "framework/*/*", // framework/{arch}

        "framework/oat/*/*", // framework/oat/{arch}

    ],

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

}



android_filesystem_defaults {

    name: "system_image_defaults",

    partition_name: "system",
@@ -428,7 +441,8 @@ android_filesystem_defaults { 
        linker_config_srcs: [":system_linker_config_json_file"],

    },

    fsverity: {

        inputs: [

        inputs: select(soong_config_variable("ANDROID", "PRODUCT_FSVERITY_GENERATE_METADATA"), {

            true: [

                "etc/boot-image.prof",

                "etc/classpaths/*.pb",

                "etc/dirty-image-objects",
@@ -437,7 +451,12 @@ android_filesystem_defaults { 
                "framework/*/*", // framework/{arch}

                "framework/oat/*/*", // framework/oat/{arch}

            ],

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

            default: [],

        }),

        libs: select(soong_config_variable("ANDROID", "PRODUCT_FSVERITY_GENERATE_METADATA"), {

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

            default: [],

        }),

    },

    build_logtags: true,

    gen_aconfig_flags_pb: true,

target/product/gsi/Android.bp

+9 −6
Original line number Diff line number Diff line
@@ -129,12 +129,6 @@ android_system_image { 
        "com.android.vndk.v33",

        "com.android.vndk.v34",



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

        // AVF

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

        "com.android.compos",

        "features_com.android.virt.xml",



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

        // gsi_product

        ///////////////////////////////////////////
@@ -145,6 +139,15 @@ android_system_image { 
        "apns-full-conf.xml",

    ],

    multilib: {

        lib64: {

            deps: [

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

                // AVF

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

                "com.android.compos",

                "features_com.android.virt.xml",

            ],

        },

        both: {

            // PRODUCT_PACKAGES_SHIPPING_API_LEVEL_34

            deps: ["android.hidl.memory@1.0-impl"],