From 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Fri, 1 Dec 2017 06:19:27 +0000 Subject: Revert "Change Python in Soong to support device side build." This reverts commit 3bba05962dc4329c6e3d28544775db591574ba7b. Reason for revert: Change-Id: I25f1380573d69f7e111287624a2d4a3d95fdd86b --- python/test.go | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'python/test.go') diff --git a/python/test.go b/python/test.go index 825e63cc..de2b13e1 100644 --- a/python/test.go +++ b/python/test.go @@ -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() -} -- cgit v1.2.3