diff options
| author | 2017-12-01 20:00:31 +0000 | |
|---|---|---|
| committer | 2017-12-01 20:00:31 +0000 | |
| commit | d9ec5e7dea386f00594c43685eb25cdb6c0b6cba (patch) | |
| tree | 8ebc182125ea5934c824a583c07b123ffa1010f7 /python/androidmk.go | |
| parent | 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602 (diff) | |
Revert "Revert "Change Python in Soong to support device side build.""
This reverts commit 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602.
Reason for revert: <libsqlite was missing for darwin_x86_64 before>
Change-Id: I2e13e849a503a705ffad425df292380f2f73954e
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 4c9445080..5fa01abb5 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) { |