Add aapt includes for prebuilt SDK jars am: 9ca6942956 am: 022c52e269

am: 380c9a1f87

Change-Id: I1c5c4b13ffe7390953c9763e3090639b5eedd154

java/app.go

@@ -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 {