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

Revert "Revert "Change Python in Soong to support device side build.""

Browse Source 
This reverts commit 0a32e5936b.

Reason for revert: <libsqlite was missing for darwin_x86_64 before>

Change-Id: I2e13e849a503a705ffad425df292380f2f73954e
This commit is contained in:
Nan Zhang
2017-12-01 20:00:31 +00:00
parent 0a32e5936b
commit d9ec5e7dea
6 changed files with 58 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/test.go
View File

@@ -22,6 +22,7 @@ import (
func init() {
android.RegisterModuleType("python_test_host", PythonTestHostFactory)
android.RegisterModuleType("python_test", PythonTestFactory)
}
type testDecorator struct {
@@ -29,13 +30,18 @@ type testDecorator struct {
}
func (test *testDecorator) install(ctx android.ModuleContext, file android.Path) {
test.binaryDecorator.baseInstaller.install(ctx, file)
test.binaryDecorator.pythonInstaller.dir = "nativetest"
test.binaryDecorator.pythonInstaller.dir64 = "nativetest64"
test.binaryDecorator.pythonInstaller.relative = ctx.ModuleName()
test.binaryDecorator.pythonInstaller.install(ctx, file)
}
func NewTest(hod android.HostOrDeviceSupported) *Module {
module, binary := NewBinary(hod)
binary.baseInstaller = NewPythonInstaller("nativetest")
binary.pythonInstaller = NewPythonInstaller("nativetest", "nativetest64")
test := &testDecorator{binaryDecorator: binary}
@@ -50,3 +56,10 @@ func PythonTestHostFactory() android.Module {
return module.Init()
}
func PythonTestFactory() android.Module {
module := NewTest(android.HostAndDeviceSupported)
module.multilib = android.MultilibBoth
return module.Init()
}