diff options
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/app.go b/java/app.go index 05cd8b31d..34f05b736 100644 --- a/java/app.go +++ b/java/app.go @@ -34,7 +34,7 @@ func init() { // AndroidManifest.xml merging // package splits -type androidAppProperties struct { +type appProperties struct { // path to a certificate, or the name of a certificate in the default // certificate directory, or blank to use the default product certificate Certificate *string @@ -71,7 +71,7 @@ type androidAppProperties struct { type AndroidApp struct { Module - appProperties androidAppProperties + appProperties appProperties aaptSrcJar android.Path exportPackage android.Path @@ -273,6 +273,12 @@ func (a *AndroidApp) aapt2Flags(ctx android.ModuleContext) (flags []string, deps linkDeps = append(linkDeps, depFiles...) }) + sdkDep := decodeSdkDep(ctx, String(a.deviceProperties.Sdk_version)) + if sdkDep.useFiles { + linkFlags = append(linkFlags, "-I "+sdkDep.jar.String()) + linkDeps = append(linkDeps, sdkDep.jar) + } + // SDK version flags sdkVersion := String(a.deviceProperties.Sdk_version) switch sdkVersion { |