diff options
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/java/aar.go b/java/aar.go index c6212766..6273a9b5 100644 --- a/java/aar.go +++ b/java/aar.go @@ -17,6 +17,7 @@ package java import ( "android/soong/android" "fmt" + "path/filepath" "strings" "github.com/google/blueprint" @@ -78,6 +79,7 @@ type aapt struct { rroDirs []rroDir rTxt android.Path extraAaptPackagesFile android.Path + noticeFile android.OptionalPath isLibrary bool uncompressedJNI bool useEmbeddedDex bool @@ -150,10 +152,16 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext sdkContext, mani assetFiles = append(assetFiles, androidResourceGlob(ctx, dir)...) } + assetDirStrings := assetDirs.Strings() + if a.noticeFile.Valid() { + assetDirStrings = append(assetDirStrings, filepath.Dir(a.noticeFile.Path().String())) + assetFiles = append(assetFiles, a.noticeFile.Path()) + } + linkFlags = append(linkFlags, "--manifest "+manifestPath.String()) linkDeps = append(linkDeps, manifestPath) - linkFlags = append(linkFlags, android.JoinWithPrefix(assetDirs.Strings(), "-A ")) + linkFlags = append(linkFlags, android.JoinWithPrefix(assetDirStrings, "-A ")) linkDeps = append(linkDeps, assetFiles...) // SDK version flags |