diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-12 01:01:40 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-12 01:01:40 +0000 |
| commit | 1e61b62adce50e5af56b08545da08efddba5c6c9 (patch) | |
| tree | b1f26eed01ac189406b9de56804efc94889ed014 | |
| parent | 83aa1c689b4e1b193ea636701293afda3e5ec8c2 (diff) | |
| parent | 192221b55e134385ef387188cdcb450b9d991167 (diff) | |
Snap for 7633965 from 192221b55e134385ef387188cdcb450b9d991167 to sc-release
Change-Id: Id460cb4564f3299f372c6ac958a1cfa32384477a
| -rw-r--r-- | apex/apex.go | 2 | ||||
| -rw-r--r-- | java/app_import.go | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index bea54bccc..77854074b 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1522,6 +1522,7 @@ type androidApp interface { JacocoReportClassesFile() android.Path Certificate() java.Certificate BaseModuleName() string + LintDepSets() java.LintDepSets } var _ androidApp = (*java.AndroidApp)(nil) @@ -1536,6 +1537,7 @@ func apexFileForAndroidApp(ctx android.BaseModuleContext, aapp androidApp) apexF fileToCopy := aapp.OutputFile() af := newApexFile(ctx, fileToCopy, aapp.BaseModuleName(), dirInApex, app, aapp) af.jacocoReportClassesFile = aapp.JacocoReportClassesFile() + af.lintDepSets = aapp.LintDepSets() af.certificate = aapp.Certificate() if app, ok := aapp.(interface { diff --git a/java/app_import.go b/java/app_import.go index 839051ea8..3371e8e1f 100644 --- a/java/app_import.go +++ b/java/app_import.go @@ -402,6 +402,10 @@ func (a *AndroidAppImport) MinSdkVersion(ctx android.EarlyModuleContext) android return android.SdkSpecPrivate } +func (a *AndroidAppImport) LintDepSets() LintDepSets { + return LintDepSets{} +} + var _ android.ApexModule = (*AndroidAppImport)(nil) // Implements android.ApexModule |