Add aapt includes for prebuilt SDK jars am: 9ca6942956

am: 022c52e269

Change-Id: I8fdda06cba16df50fd217a9fcdbea936f95b1edc
This commit is contained in:
Colin Cross
2018-02-22 23:32:23 +00:00
committed by android-build-merger

View File

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