diff options
| author | 2020-07-08 01:09:23 +0900 | |
|---|---|---|
| committer | 2020-08-07 12:15:52 +0900 | |
| commit | 816a23a50d3dc4ef600583fb58854c3d1b293d09 (patch) | |
| tree | bee44a4d4f69c16840225fe9f4c7d1d5e13a8e18 /java/lint.go | |
| parent | 79dcf732cc673b788df9974062b97aa9731b9168 (diff) | |
Introduce AlwaysUsePrebuiltSdks
Instead of UnbundledBuild, use AlwaysUsePrebuiltSdks
to determine if java modules needs to be built against prebuilt sdks.
And rename UnbundledBuildUsePrebuiltSdks to AlwaysUsePrebuiltSdks to
express its behavior more correctly.(It can be orthgonal to "Unbundled")
Bug: 160390776
Test: TARGET_BUILD_UNBUNDLED_IMAGE=true m vendorimage
Change-Id: I0be7265c1959d8774c295372cd7a9250169f6df9
Diffstat (limited to 'java/lint.go')
| -rw-r--r-- | java/lint.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/lint.go b/java/lint.go index 1bf7f69fd..f2091db7b 100644 --- a/java/lint.go +++ b/java/lint.go @@ -309,7 +309,7 @@ func (l *linter) lint(ctx android.ModuleContext) { rule.Command().Text("mkdir -p").Flag(cacheDir.String()).Flag(homeDir.String()) var annotationsZipPath, apiVersionsXMLPath android.Path - if ctx.Config().UnbundledBuildUsePrebuiltSdks() { + if ctx.Config().AlwaysUsePrebuiltSdks() { annotationsZipPath = android.PathForSource(ctx, "prebuilts/sdk/current/public/data/annotations.zip") apiVersionsXMLPath = android.PathForSource(ctx, "prebuilts/sdk/current/public/data/api-versions.xml") } else { @@ -395,7 +395,7 @@ func (l *lintSingleton) GenerateBuildActions(ctx android.SingletonContext) { } func (l *lintSingleton) copyLintDependencies(ctx android.SingletonContext) { - if ctx.Config().UnbundledBuildUsePrebuiltSdks() { + if ctx.Config().AlwaysUsePrebuiltSdks() { return } |