openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add java_data parameter to python modules 

csuite has a python module that wants to embed the outputs of java
modules.  This has caused issues with mismatched variants bewteen
the arch-specific python module and the common java modules.  Add
a java_data property that is similar to the data property but
uses the common arch variant.

Bug: 173977903
Test: m checkbuild
Change-Id: I0f2f0e4159650cd5d42b510d5177678e7ee91b4d
This commit is contained in:
Colin Cross 2020-11-22 20:12:45 -08:00
parent e20113d8ab
commit 1bc63938f0
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/python.go
View File

@ -86,6 +86,9 @@ type BaseProperties struct {
// the test. the file extension can be arbitrary except for (.py). // the test. the file extension can be arbitrary except for (.py).
Data []string `android:"path,arch_variant"` Data []string `android:"path,arch_variant"`
// list of java modules that provide data that should be installed alongside the test.
Java_data []string
// list of the Python libraries compatible both with Python2 and Python3. // list of the Python libraries compatible both with Python2 and Python3.
Libs []string `android:"arch_variant"` Libs []string `android:"arch_variant"`
@ -216,6 +219,7 @@ type dependencyTag struct {
var ( var (
pythonLibTag = dependencyTag{name: "pythonLib"} pythonLibTag = dependencyTag{name: "pythonLib"}
javaDataTag = dependencyTag{name: "javaData"}
launcherTag = dependencyTag{name: "launcher"} launcherTag = dependencyTag{name: "launcher"}
launcherSharedLibTag = dependencyTag{name: "launcherSharedLib"} launcherSharedLibTag = dependencyTag{name: "launcherSharedLib"}
pyIdentifierRegexp = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_-]*$`) pyIdentifierRegexp = regexp.MustCompile(`^[a-zA-Z_][a-zA-Z0-9_-]*$`)
@ -370,6 +374,11 @@ func (p *Module) DepsMutator(ctx android.BottomUpMutatorContext) {
panic(fmt.Errorf("unknown Python Actual_version: %q for module: %q.", panic(fmt.Errorf("unknown Python Actual_version: %q for module: %q.",
p.properties.Actual_version, ctx.ModuleName())) p.properties.Actual_version, ctx.ModuleName()))
} }
// Emulate the data property for java_data but with the arch variation overridden to "common"
// so that it can point to java modules.
javaDataVariation := []blueprint.Variation{{"arch", android.Common.String()}}
ctx.AddVariationDependencies(javaDataVariation, javaDataTag, p.properties.Java_data...)
} }
func (p *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (p *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@ -416,6 +425,11 @@ func (p *Module) GeneratePythonBuildActions(ctx android.ModuleContext) {
// expand data files from "data" property. // expand data files from "data" property.
expandedData := android.PathsForModuleSrc(ctx, p.properties.Data) expandedData := android.PathsForModuleSrc(ctx, p.properties.Data)
// Emulate the data property for java_data dependencies.
for _, javaData := range ctx.GetDirectDepsWithTag(javaDataTag) {
expandedData = append(expandedData, android.OutputFilesForModule(ctx, javaData, "")...)
}
// sanitize pkg_path. // sanitize pkg_path.
pkgPath := String(p.properties.Pkg_path) pkgPath := String(p.properties.Pkg_path)
if pkgPath != "" { if pkgPath != "" {

10
python/test.go
View File

@ -45,6 +45,9 @@ type TestProperties struct {
// the test // the test
Data []string `android:"path,arch_variant"` Data []string `android:"path,arch_variant"`
// list of java modules that provide data that should be installed alongside the test.
Java_data []string
// Test options. // Test options.
Test_options TestOptions Test_options TestOptions
} }
@ -80,6 +83,13 @@ func (test *testDecorator) install(ctx android.ModuleContext, file android.Path)
for _, dataSrcPath := range dataSrcPaths { for _, dataSrcPath := range dataSrcPaths {
test.data = append(test.data, android.DataPath{SrcPath: dataSrcPath}) test.data = append(test.data, android.DataPath{SrcPath: dataSrcPath})
} }
// Emulate the data property for java_data dependencies.
for _, javaData := range ctx.GetDirectDepsWithTag(javaDataTag) {
for _, javaDataSrcPath := range android.OutputFilesForModule(ctx, javaData, "") {
test.data = append(test.data, android.DataPath{SrcPath: javaDataSrcPath})
}
}
} }
func NewTest(hod android.HostOrDeviceSupported) *Module { func NewTest(hod android.HostOrDeviceSupported) *Module {