aboutsummaryrefslogtreecommitdiffstats
path: root/python/androidmk.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-08-10 17:00:19 -0700
committerColin Cross <ccross@android.com>2017-08-11 15:24:11 -0700
commita18e9cfa29d22949d2c005fe2b51c5ffa2bf6379 (patch)
treefd4733237ef52794c6a0d2e5b63e617b93613b06 /python/androidmk.go
parent91825d2279fb9066ec6ffd4ce2070eb070ce38cf (diff)
downloadbuild_soong-a18e9cfa29d22949d2c005fe2b51c5ffa2bf6379.tar.gz
build_soong-a18e9cfa29d22949d2c005fe2b51c5ffa2bf6379.tar.bz2
build_soong-a18e9cfa29d22949d2c005fe2b51c5ffa2bf6379.zip
Remove error from AndroidMkDataProvider.AndroidMk
It's never anything except nil, and it unnecessarily complicates the implementations. Test: m -j checkbuild Change-Id: I3e3b7251f32ffa84dbdfd0448faf248c306ca808
Diffstat (limited to 'python/androidmk.go')
-rw-r--r--python/androidmk.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/python/androidmk.go b/python/androidmk.go
index 386eeeed..ab24e993 100644
--- a/python/androidmk.go
+++ b/python/androidmk.go
@@ -38,10 +38,12 @@ func (p *pythonBaseModule) subAndroidMk(data *android.AndroidMkData, obj interfa
}
}
-func (p *pythonBaseModule) AndroidMk() (ret android.AndroidMkData, err error) {
+func (p *pythonBaseModule) AndroidMk() android.AndroidMkData {
+ ret := android.AndroidMkData{}
+
p.subAndroidMk(&ret, p.installer)
- return ret, nil
+ return ret
}
func (p *pythonBinaryHostDecorator) AndroidMk(base *pythonBaseModule, ret *android.AndroidMkData) {