From a18e9cfa29d22949d2c005fe2b51c5ffa2bf6379 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 10 Aug 2017 17:00:19 -0700
Subject: Remove error from AndroidMkDataProvider.AndroidMk

It's never anything except nil, and it unnecessarily complicates
the implementations.

Test: m -j checkbuild
Change-Id: I3e3b7251f32ffa84dbdfd0448faf248c306ca808
---
 python/androidmk.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'python/androidmk.go')

diff --git a/python/androidmk.go b/python/androidmk.go
index 386eeeed1..ab24e9932 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) {
-- 
cgit v1.2.3-59-g8ed1b