From a54974c806f7397f6553c09cfba281ad5ebd18ed Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 29 Oct 2018 23:15:37 -0700 Subject: [PATCH] Pass AAR to make Pass the output AAR file to make, where it will be copied to the dist directory if requested by an unbundled build. Test: m checkbuild Change-Id: I126a81bd4b8ad0eeade99638ce9c2aa4579935bb --- java/androidmk.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/androidmk.go b/java/androidmk.go index 23e26addc..0d4edfe73 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -293,6 +293,9 @@ func (a *AndroidLibrary) AndroidMk() android.AndroidMkData { data := a.Library.AndroidMk() data.Extra = append(data.Extra, func(w io.Writer, outputFile android.Path) { + if a.aarFile != nil { + fmt.Fprintln(w, "LOCAL_SOONG_AAR :=", a.aarFile.String()) + } if a.proguardDictionary != nil { fmt.Fprintln(w, "LOCAL_SOONG_PROGUARD_DICT :=", a.proguardDictionary.String()) }