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

Commit 6722de12 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge "Generate /etc/{passwd,group} for all partitions"

parents 21e8cbd5 fb303a59

core/definitions.mk

+10 −2
Original line number Diff line number Diff line
@@ -2444,8 +2444,16 @@ $(2): \ 
	$(1) \

	$(HOST_INIT_VERIFIER) \

	$(HIDL_INHERITANCE_HIERARCHY) \

	$(call intermediates-dir-for,ETC,passwd)/passwd

	$(hide) $(HOST_INIT_VERIFIER) -p $(call intermediates-dir-for,ETC,passwd)/passwd -i $(HIDL_INHERITANCE_HIERARCHY) $$<

	$(call intermediates-dir-for,ETC,passwd_system)/passwd_system \

	$(call intermediates-dir-for,ETC,passwd_vendor)/passwd_vendor \

	$(call intermediates-dir-for,ETC,passwd_odm)/passwd_odm \

	$(call intermediates-dir-for,ETC,passwd_product)/passwd_product

	$(hide) $(HOST_INIT_VERIFIER) \

	  -p $(call intermediates-dir-for,ETC,passwd_system)/passwd_system \

	  -p $(call intermediates-dir-for,ETC,passwd_vendor)/passwd_vendor \

	  -p $(call intermediates-dir-for,ETC,passwd_odm)/passwd_odm \

	  -p $(call intermediates-dir-for,ETC,passwd_product)/passwd_product \

	  -i $(HIDL_INHERITANCE_HIERARCHY) $$<

else

$(2): $(1)

endif

target/product/base_product.mk

+2 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


# Base modules and settings for the product partition.

PRODUCT_PACKAGES += \

    group_product \

    healthd \

    ModuleMetadata \

    passwd_product \

    product_compatibility_matrix.xml \

    product_manifest.xml \

target/product/base_system.mk

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ PRODUCT_PACKAGES += \ 
    fsck_msdos \

    fs_config_files_system \

    fs_config_dirs_system \

    group_system \

    gsid \

    heapprofd \

    heapprofd_client \
@@ -210,6 +211,7 @@ PRODUCT_PACKAGES += \ 
    NetworkStack \

    org.apache.http.legacy \

    otacerts \

    passwd_system \

    perfetto \

    ping \

    ping6 \

target/product/base_vendor.mk

+4 −2
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ PRODUCT_PACKAGES += \ 
    fs_config_files_nonsystem \

    fs_config_dirs_nonsystem \

    gralloc.default \

    group \

    group_odm \

    group_vendor \

    init_vendor \

    libashmemd_hidl_client \

    libbundlewrapper \
@@ -62,7 +63,8 @@ PRODUCT_PACKAGES += \ 
    libreverbwrapper \

    libril \

    libvisualizer \

    passwd \

    passwd_odm \

    passwd_vendor \

    selinux_policy_nonsystem \

    shell_and_utilities_vendor \

    vndservice \

tools/fs_config/Android.bp

+157 −13
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ bootstrap_go_package { 
        "soong-genrule",

    ],

    srcs: [

        "fs_config.go"

        "fs_config.go",

    ],

    pluginFor: ["soong_build"],

}
@@ -56,13 +56,13 @@ cc_library_headers { 
    export_generated_headers: ["oemaids_header_gen"],

}



// Generate the vendor/etc/passwd text file for the target

// This file may be empty if no AIDs are defined in

// Generate the */etc/passwd text files for the target

// These files may be empty if no AIDs are defined in

// TARGET_FS_CONFIG_GEN files.

genrule {

    name: "passwd_gen",

    name: "passwd_gen_system",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) passwd --required-prefix=vendor_ --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    cmd: "$(location fs_config_generator.py) passwd --partition=system --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",
@@ -71,18 +71,90 @@ genrule { 
}



prebuilt_etc {

    name: "passwd",

    name: "passwd_system",

    filename: "passwd",

    src: ":passwd_gen_system",

}



genrule {

    name: "passwd_gen_vendor",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) passwd --partition=vendor --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

    ],

    out: ["passwd"],

}



prebuilt_etc {

    name: "passwd_vendor",

    filename: "passwd",

    vendor: true,

    src: ":passwd_gen",

    src: ":passwd_gen_vendor",

}



genrule {

    name: "passwd_gen_odm",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) passwd --partition=odm --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

    ],

    out: ["passwd"],

}



prebuilt_etc {

    name: "passwd_odm",

    filename: "passwd",

    device_specific: true,

    src: ":passwd_gen_odm",

}



genrule {

    name: "passwd_gen_product",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) passwd --partition=product --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

    ],

    out: ["passwd"],

}



prebuilt_etc {

    name: "passwd_product",

    filename: "passwd",

    product_specific: true,

    src: ":passwd_gen_product",

}



genrule {

    name: "passwd_gen_system_ext",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) passwd --partition=system_ext --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

    ],

    out: ["passwd"],

}



prebuilt_etc {

    name: "passwd_system_ext",

    filename: "passwd",

    system_ext_specific: true,

    src: ":passwd_gen_system_ext",

}



// Generate the vendor/etc/group text file for the target

// This file may be empty if no AIDs are defined in

// Generate the */etc/group text files for the target

// These files may be empty if no AIDs are defined in

// TARGET_FS_CONFIG_GEN files.

genrule {

    name: "group_gen",

    name: "group_gen_system",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) group --required-prefix=vendor_ --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    cmd: "$(location fs_config_generator.py) group --partition=system --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",
@@ -91,7 +163,79 @@ genrule { 
}



prebuilt_etc {

    name: "group",

    name: "group_system",

    filename: "group",

    src: ":group_gen_system",

}



genrule {

    name: "group_gen_vendor",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) group --partition=vendor --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

    ],

    out: ["group"],

}



prebuilt_etc {

    name: "group_vendor",

    filename: "group",

    vendor: true,

    src: ":group_gen",

    src: ":group_gen_vendor",

}



genrule {

    name: "group_gen_odm",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) group --partition=odm --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

    ],

    out: ["group"],

}



prebuilt_etc {

    name: "group_odm",

    filename: "group",

    device_specific: true,

    src: ":group_gen_odm",

}



genrule {

    name: "group_gen_product",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) group --partition=product --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

    ],

    out: ["group"],

}



prebuilt_etc {

    name: "group_product",

    filename: "group",

    product_specific: true,

    src: ":group_gen_product",

}



genrule {

    name: "group_gen_system_ext",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) group --partition=system_ext --aid-header=$(location :android_filesystem_config_header) $(locations :target_fs_config_gen) >$(out)",

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

    ],

    out: ["group"],

}



prebuilt_etc {

    name: "group_system_ext",

    filename: "group",

    system_ext_specific: true,

    src: ":group_gen_system_ext",

}