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/androidmk.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/androidmk.go')
| -rw-r--r-- | python/androidmk.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/androidmk.go b/python/androidmk.go index 4c944508..5fa01abb 100644 --- a/python/androidmk.go +++ b/python/androidmk.go @@ -39,7 +39,7 @@ func (p *Module) subAndroidMk(data *android.AndroidMkData, obj interface{}) { } func (p *Module) AndroidMk() android.AndroidMkData { - ret := android.AndroidMkData{} + ret := android.AndroidMkData{OutputFile: p.installSource} p.subAndroidMk(&ret, p.installer) @@ -55,7 +55,7 @@ func (p *binaryDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) { strings.Join(p.binaryProperties.Test_suites, " ")) } }) - base.subAndroidMk(ret, p.baseInstaller) + base.subAndroidMk(ret, p.pythonInstaller) } func (p *testDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) { @@ -67,7 +67,7 @@ func (p *testDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) { strings.Join(p.binaryDecorator.binaryProperties.Test_suites, " ")) } }) - base.subAndroidMk(ret, p.binaryDecorator.baseInstaller) + base.subAndroidMk(ret, p.binaryDecorator.pythonInstaller) } func (installer *pythonInstaller) AndroidMk(base *Module, ret *android.AndroidMkData) { |