diff options
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/aar.go b/java/aar.go index 15a542e1d..7fc39b6da 100644 --- a/java/aar.go +++ b/java/aar.go @@ -980,6 +980,9 @@ type AARImport struct { sdkVersion android.SdkSpec minSdkVersion android.ApiLevel + + // Single aconfig "cache file" merged from this module and all dependencies. + mergedAconfigFiles map[string]android.Paths } var _ android.OutputFileProducer = (*AARImport)(nil) @@ -1274,6 +1277,7 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { android.SetProvider(ctx, JniPackageProvider, JniPackageInfo{ JniPackages: a.jniPackages, }) + android.CollectDependencyAconfigFiles(ctx, &a.mergedAconfigFiles) } func (a *AARImport) HeaderJars() android.Paths { |