From 0a32e5936b4c87bc705d06fa2d4f6fed1f58d602 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Fri, 1 Dec 2017 06:19:27 +0000 Subject: Revert "Change Python in Soong to support device side build." This reverts commit 3bba05962dc4329c6e3d28544775db591574ba7b. Reason for revert: Change-Id: I25f1380573d69f7e111287624a2d4a3d95fdd86b --- python/androidmk.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'python/androidmk.go') diff --git a/python/androidmk.go b/python/androidmk.go index 5fa01abb5..4c9445080 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{OutputFile: p.installSource} + ret := android.AndroidMkData{} 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.pythonInstaller) + base.subAndroidMk(ret, p.baseInstaller) } 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.pythonInstaller) + base.subAndroidMk(ret, p.binaryDecorator.baseInstaller) } func (installer *pythonInstaller) AndroidMk(base *Module, ret *android.AndroidMkData) { -- cgit v1.2.3-59-g8ed1b