Trigger binary installation in Soong from Make am: 03ce63eaa6

am: f9a8e25486

Change-Id: I0b1d36df06a6576ee53519cfd4620cf0619abb12
This commit is contained in:
Dan Willemsen 2016-09-29 22:47:52 +00:00 committed by android-build-merger
commit 13e53fd9c1
1 changed files with 6 additions and 0 deletions

View File

@ -192,6 +192,12 @@ func (packer *relocationPacker) AndroidMk(ctx AndroidMkContext, ret *android.And
} }
func (installer *baseInstaller) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { func (installer *baseInstaller) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
// Soong installation is only supported for host modules. Have Make
// installation trigger Soong installation.
if ctx.Target().Os.Class == android.Host {
ret.OutputFile = android.OptionalPathForPath(installer.path)
}
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error { ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
path := installer.path.RelPathString() path := installer.path.RelPathString()
dir, file := filepath.Split(path) dir, file := filepath.Split(path)