StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add prebuilt_etc_xml

Browse Source 
prebuilt_etc_xml installs an xml file to <partition>/etc[/<subdir>] and
validates the xml file against the given DTD file before installing it.

This change also includes some fixes for prebuilt_etc which is the super
module of prebuilt_etc_xml:

1) The module is changed to arch-specific module as the prebuilts are only
for devices (installed under the etc dir), but not for hosts.

2) Dependency to android.Prebuilt is removed because android.Prebuilt is
intended to be used for the case when a module can exist as prebuilts,
source or both. These prebuilt_etc_* modules are prebuilt only.

3) srcs property which accepts a list of source files is changed to src
that only accepts single source file, which makes more sense for
prebuilts.

Bug: 65686190
Test: m -j (xml_test.go)
Change-Id: I40484f3f6615b99f6b8d43176db0c40c5bfd838e
This commit is contained in:
Jiyong Park
2018-04-25 22:57:34 +09:00
parent aac4b84ce5
commit 5a8d1bee89
6 changed files with 280 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
android/prebuilt_etc.go
View File

@@ -28,45 +28,47 @@ func init() {
type prebuiltEtcProperties struct {
// Source file of this prebuilt.
Srcs []string `android:"arch_variant"`
Src *string `android:"arch_variant"`
// optional subdirectory under which this file is installed into
Sub_dir *string `android:"arch_variant"`
}
type prebuiltEtc struct {
type PrebuiltEtc struct {
ModuleBase
prebuilt Prebuilt
properties prebuiltEtcProperties
sourceFilePath Path
installDirPath OutputPath
sourceFilePath Path
installDirPath OutputPath
additionalDependencies *Paths
}
func (p *prebuiltEtc) Prebuilt() *Prebuilt {
return &p.prebuilt
}
func (p *prebuiltEtc) DepsMutator(ctx BottomUpMutatorContext) {
if len(p.properties.Srcs) == 0 {
ctx.PropertyErrorf("srcs", "missing prebuilt source file")
}
if len(p.properties.Srcs) > 1 {
ctx.PropertyErrorf("srcs", "multiple prebuilt source files")
func (p *PrebuiltEtc) DepsMutator(ctx BottomUpMutatorContext) {
if p.properties.Src == nil {
ctx.PropertyErrorf("src", "missing prebuilt source file")
}
// To support ":modulename" in src
ExtractSourceDeps(ctx, &(p.properties.Srcs)[0])
ExtractSourceDeps(ctx, p.properties.Src)
}
func (p *prebuiltEtc) GenerateAndroidBuildActions(ctx ModuleContext) {
p.sourceFilePath = ctx.ExpandSource(p.properties.Srcs[0], "srcs")
func (p *PrebuiltEtc) SourceFilePath(ctx ModuleContext) Path {
return ctx.ExpandSource(String(p.properties.Src), "src")
}
// This allows other derivative modules (e.g. prebuilt_etc_xml) to perform
// additional steps (like validating the src) before the file is installed.
func (p *PrebuiltEtc) SetAdditionalDependencies(paths Paths) {
p.additionalDependencies = &paths
}
func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx ModuleContext) {
p.sourceFilePath = ctx.ExpandSource(String(p.properties.Src), "src")
p.installDirPath = PathForModuleInstall(ctx, "etc", String(p.properties.Sub_dir))
}
func (p *prebuiltEtc) AndroidMk() AndroidMkData {
func (p *PrebuiltEtc) AndroidMk() AndroidMkData {
return AndroidMkData{
Custom: func(w io.Writer, name, prefix, moduleDir string, data AndroidMkData) {
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
@@ -76,16 +78,26 @@ func (p *prebuiltEtc) AndroidMk() AndroidMkData {
fmt.Fprintln(w, "LOCAL_MODULE_TAGS := optional")
fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", p.sourceFilePath.String())
fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", "$(OUT_DIR)/"+p.installDirPath.RelPathString())
if p.additionalDependencies != nil {
fmt.Fprint(w, "LOCAL_ADDITIONAL_DEPENDENCIES :=")
for _, path := range *p.additionalDependencies {
fmt.Fprint(w, " "+path.String())
}
fmt.Fprintln(w, "")
}
fmt.Fprintln(w, "include $(BUILD_PREBUILT)")
},
}
}
func PrebuiltEtcFactory() Module {
module := &prebuiltEtc{}
module.AddProperties(&module.properties)
func InitPrebuiltEtcModule(p *PrebuiltEtc) {
p.AddProperties(&p.properties)
}
InitPrebuiltModule(module, &(module.properties.Srcs))
InitAndroidModule(module)
func PrebuiltEtcFactory() Module {
module := &PrebuiltEtc{}
InitPrebuiltEtcModule(module)
// This module is device-only
InitAndroidArchModule(module, DeviceSupported, MultilibCommon)
return module
}