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

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

Browse Source 
This reverts commit 0a32e5936b.

Reason for revert: <libsqlite was missing for darwin_x86_64 before>

Change-Id: I2e13e849a503a705ffad425df292380f2f73954e
This commit is contained in:
Nan Zhang
2017-12-01 20:00:31 +00:00
parent 0a32e5936b
commit d9ec5e7dea
6 changed files with 58 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/androidmk.go
View File

@@ -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) {