diff options
| author | Colin Cross <ccross@android.com> | 2018-02-22 23:36:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-22 23:36:22 +0000 |
| commit | a833f3c1cccc4268ae575042de573643c785ed37 (patch) | |
| tree | 918ea0e6a4d669e01cc863296bc2d06c2337059b /java | |
| parent | 7df0d3585d9fef80754aa1c526dbc03253a87c95 (diff) | |
| parent | 380c9a1f8779ce2f6d25751cc3192c6ff4d2c49c (diff) | |
| download | build_soong-a833f3c1cccc4268ae575042de573643c785ed37.tar.gz build_soong-a833f3c1cccc4268ae575042de573643c785ed37.tar.bz2 build_soong-a833f3c1cccc4268ae575042de573643c785ed37.zip | |
Add aapt includes for prebuilt SDK jars am: 9ca6942956 am: 022c52e269
am: 380c9a1f87
Change-Id: I1c5c4b13ffe7390953c9763e3090639b5eedd154
Diffstat (limited to 'java')
| -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 { |