Add aapt includes for prebuilt SDK jars
Add -I arguments to the aapt link command line if sdk_version is
set to a numbered SDK prebuilt jar.
Test: m checkbuild
Change-Id: Ieeadf84bc131ba94e0e4ee1b9eec7d1e80b31b19
diff --git a/java/app.go b/java/app.go
index 05cd8b3..dc7f848 100644
--- a/java/app.go
+++ b/java/app.go
@@ -273,6 +273,12 @@
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 {