diff options
| author | 2024-01-09 22:47:39 +0000 | |
|---|---|---|
| committer | 2024-01-10 14:03:30 +0000 | |
| commit | afe7baf47db292f1837d658a42dd3920b8e2bc10 (patch) | |
| tree | 861a720fc9651b8a4c1f412328f8497858d14d7d /java/aar.go | |
| parent | acae2d765654a0b1297b35a1de60b4fff2172870 (diff) | |
Propagate aconfig providers for more modules.
Bug: 308625757
Test: manual
Change-Id: Iaf6d45a4259f1c6c34476c34c431344283ae2830
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 { |