diff options
| author | Colin Cross <ccross@android.com> | 2018-02-20 15:30:31 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-02-22 14:36:24 -0800 |
| commit | 9ca6942956fddc395d68484993ce54275c234b4f (patch) | |
| tree | 21a5cccf093ecd5404c80c83e1d8cce287f06897 /java/app.go | |
| parent | 2f2f24f775c1670c6a901a2f5f2e47dcaeb63c0d (diff) | |
| download | build_soong-9ca6942956fddc395d68484993ce54275c234b4f.tar.gz build_soong-9ca6942956fddc395d68484993ce54275c234b4f.tar.bz2 build_soong-9ca6942956fddc395d68484993ce54275c234b4f.zip | |
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
Diffstat (limited to 'java/app.go')
| -rw-r--r-- | java/app.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/app.go b/java/app.go index 05cd8b31..dc7f8487 100644 --- a/java/app.go +++ b/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 { |