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

Commit e531685b authored by Dan Willemsen's avatar Dan Willemsen
Browse files

TARGET_FS_CONFIG_GEN is a list, not a single path 

Bug: 130787336
Test: m oemaids_header_gen oemaids_headers passwd group
Test: Set TARGET_FS_CONFIG_GEN to a list of paths
Change-Id: I5186b378fea8865f46cfd891420ba576f36e2565
Merged-In: I5186b378fea8865f46cfd891420ba576f36e2565
(cherry picked from commit 7f25f2ae)
parent 498aa082

core/soong_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ $(call add_json_list, ProductHiddenAPIStubs, $(PRODUCT_HIDDENAPI_STU 
$(call add_json_list, ProductHiddenAPIStubsSystem,       $(PRODUCT_HIDDENAPI_STUBS_SYSTEM))

$(call add_json_list, ProductHiddenAPIStubsTest,         $(PRODUCT_HIDDENAPI_STUBS_TEST))



$(call add_json_str,  TargetFSConfigGen,                 $(TARGET_FS_CONFIG_GEN))

$(call add_json_list, TargetFSConfigGen,                 $(TARGET_FS_CONFIG_GEN))



$(call add_json_map, VendorVars)

$(foreach namespace,$(SOONG_CONFIG_NAMESPACES),\

tools/fs_config/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ target_fs_config_gen_filegroup { 
genrule {

    name: "oemaids_header_gen",

    tool_files: ["fs_config_generator.py"],

    cmd: "$(location fs_config_generator.py) oemaid --aid-header=$(location :android_filesystem_config_header) $(location :target_fs_config_gen) >$(out)",

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

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",
@@ -62,7 +62,7 @@ cc_library_headers { 
genrule {

    name: "passwd_gen",

    tool_files: ["fs_config_generator.py"],

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

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

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",
@@ -82,7 +82,7 @@ prebuilt_etc { 
genrule {

    name: "group_gen",

    tool_files: ["fs_config_generator.py"],

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

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

    srcs: [

        ":target_fs_config_gen",

        ":android_filesystem_config_header",

tools/fs_config/fs_config.go

+6 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ func init() { 
	android.RegisterModuleType("target_fs_config_gen_filegroup", targetFSConfigGenFactory)

}



// target_fs_config_gen_filegroup is used to expose the file pointed to by TARGET_FS_CONFIG_GEN to

// target_fs_config_gen_filegroup is used to expose the files pointed to by TARGET_FS_CONFIG_GEN to

// genrules in Soong. If TARGET_FS_CONFIG_GEN is empty, it will export an empty file instead.

func targetFSConfigGenFactory() android.Module {

	module := &targetFSConfigGen{}
@@ -36,17 +36,17 @@ var _ android.SourceFileProducer = (*targetFSConfigGen)(nil) 


type targetFSConfigGen struct {

	android.ModuleBase

	path android.Path

	paths android.Paths

}



func (targetFSConfigGen) DepsMutator(ctx android.BottomUpMutatorContext) {}



func (t *targetFSConfigGen) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	if ret := ctx.DeviceConfig().TargetFSConfigGen(); ret != nil && *ret != "" {

		t.path = android.PathForSource(ctx, *ret)

	if ret := ctx.DeviceConfig().TargetFSConfigGen(); len(ret) != 0 {

		t.paths = android.PathsForSource(ctx, ret)

	} else {

		path := android.PathForModuleGen(ctx, "empty")

		t.path = path

		t.paths = android.Paths{path}



		rule := android.NewRuleBuilder()

		rule.Command().Text("rm -rf").Output(path)
@@ -56,5 +56,5 @@ func (t *targetFSConfigGen) GenerateAndroidBuildActions(ctx android.ModuleContex 
}



func (t *targetFSConfigGen) Srcs() android.Paths {

	return android.Paths{t.path}

	return t.paths

}