diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-11-15 17:59:56 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2017-11-30 13:55:49 -0800 |
| commit | 3bba05962dc4329c6e3d28544775db591574ba7b (patch) | |
| tree | 8ebc182125ea5934c824a583c07b123ffa1010f7 /python/binary.go | |
| parent | e261615792dbe84250fea54c26ca7972293d23c6 (diff) | |
| download | build_soong-3bba05962dc4329c6e3d28544775db591574ba7b.tar.gz build_soong-3bba05962dc4329c6e3d28544775db591574ba7b.tar.bz2 build_soong-3bba05962dc4329c6e3d28544775db591574ba7b.zip | |
Change Python in Soong to support device side build.
Add python_test to generate executables for both host and device side.
And change python_library_host to python_library.
installation for python device test will be under
target/product/generic_arm[64]/data/nativetest[64].
Bug: b/69114465
Test: m clean && m -j
Device Test:
adb root; adb push nan_devicetest /data;
adb shell; ./nan_devicetest
print(sys.path)
['/data/nan_devicetest/runfiles', '/data/nan_devicetest', '/data/nan_devicetest/internal', '/data/nan_devicetest/internal/stdlib']
Change-Id: If8317070a3aa1b6dab2e84b8df2d037f495d7247
Diffstat (limited to 'python/binary.go')
| -rw-r--r-- | python/binary.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/python/binary.go b/python/binary.go index 14c49527..457c7fa0 100644 --- a/python/binary.go +++ b/python/binary.go @@ -49,24 +49,20 @@ type BinaryProperties struct { type binaryDecorator struct { binaryProperties BinaryProperties - baseInstaller *pythonInstaller + *pythonInstaller } type IntermPathProvider interface { IntermPathForModuleOut() android.OptionalPath } -func (binary *binaryDecorator) install(ctx android.ModuleContext, file android.Path) { - binary.baseInstaller.install(ctx, file) -} - var ( stubTemplateHost = "build/soong/python/scripts/stub_template_host.txt" ) func NewBinary(hod android.HostOrDeviceSupported) (*Module, *binaryDecorator) { module := newModule(hod, android.MultilibFirst) - decorator := &binaryDecorator{baseInstaller: NewPythonInstaller("bin")} + decorator := &binaryDecorator{pythonInstaller: NewPythonInstaller("bin", "")} module.bootstrapper = decorator module.installer = decorator |