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

Commit 1a7cf08e authored by Jiyong Park's avatar Jiyong Park
Browse files

Add filename_from_src property to prebuilt_etc 

Base name of the output file of a prebuilt_etc is by default the module
name. This default behavior can be customized by either via the
'filename' property or the new 'filename_from_src' property. The former
explicitly sets the base name while the latter makes the file name to be
that of the source file.

Test: m (prebuilt_etc_test added)
Change-Id: Ic2900417bda62993f6de2612d993234b82b74479
parent 2fcac47e

android/prebuilt_etc.go

+13 −1
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ type prebuiltEtcProperties struct { 
	// optional name for the installed file. If unspecified, name of the module is used as the file name

	Filename *string `android:"arch_variant"`



	// when set to true, and filename property is not set, the name for the installed file

	// is the same as the file name of the source file.

	Filename_from_src *bool `android:"arch_variant"`



	// Make this module available when building for recovery.

	Recovery_available *bool
@@ -106,9 +110,17 @@ func (p *PrebuiltEtc) Installable() bool { 
func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx ModuleContext) {

	p.sourceFilePath = ctx.ExpandSource(String(p.properties.Src), "src")

	filename := String(p.properties.Filename)

	filename_from_src := Bool(p.properties.Filename_from_src)

	if filename == "" {

		if filename_from_src {

			filename = p.sourceFilePath.Base()

		} else {

			filename = ctx.ModuleName()

		}

	} else if filename_from_src {

		ctx.PropertyErrorf("filename_from_src", "filename is set. filename_from_src can't be true")

		return

	}

	p.outputFilePath = PathForModuleOut(ctx, filename).OutputPath

	p.installDirPath = PathForModuleInstall(ctx, "etc", String(p.properties.Sub_dir))

android/prebuilt_etc_test.go

+24 −0
Original line number Diff line number Diff line
@@ -106,3 +106,27 @@ func TestPrebuiltEtcOutputPath(t *testing.T) { 
		t.Errorf("expected foo.installed.conf, got %q", p.outputFilePath.Base())

	}

}



func TestPrebuiltEtcGlob(t *testing.T) {

	ctx := testPrebuiltEtc(t, `

		prebuilt_etc {

			name: "my_foo",

			src: "foo.*",

		}

		prebuilt_etc {

			name: "my_bar",

			src: "bar.*",

			filename_from_src: true,

		}

	`)



	p := ctx.ModuleForTests("my_foo", "android_common_core").Module().(*PrebuiltEtc)

	if p.outputFilePath.Base() != "my_foo" {

		t.Errorf("expected my_foo, got %q", p.outputFilePath.Base())

	}



	p = ctx.ModuleForTests("my_bar", "android_common_core").Module().(*PrebuiltEtc)

	if p.outputFilePath.Base() != "bar.conf" {

		t.Errorf("expected bar.conf, got %q", p.outputFilePath.Base())

	}

}