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

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

Browse Source 
This reverts commit 3bba05962d.

Reason for revert: <revert mac builds>

Change-Id: I25f1380573d69f7e111287624a2d4a3d95fdd86b
This commit is contained in:
Nan Zhang
2017-12-01 06:19:27 +00:00
parent 3bba05962d
commit 0a32e5936b
6 changed files with 16 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/test.go
View File

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