diff options
| author | 2023-03-23 11:51:49 -0400 | |
|---|---|---|
| committer | 2023-03-24 15:14:53 -0400 | |
| commit | 2b3f56ed22b952011d6d8693b11c29b08a39d35d (patch) | |
| tree | ac45b27eabb0291f347a247cda2807b4ae5ded42 /java/java.go | |
| parent | 10e5a0e987f56ab2dfcf754995df470317759615 (diff) | |
Add apex_available aidl + aidl&lang libraries
Test: b build com.android.neuralnetworks com.android.media.swcodec
Change-Id: I008b915b22e4c8c2cf1f0aee6cfdaf17374cb3a9
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 2a7e4e1bf..370781599 100644 --- a/java/java.go +++ b/java/java.go @@ -2625,10 +2625,12 @@ type eventLogTagsAttributes struct { type aidlLibraryAttributes struct { Srcs bazel.LabelListAttribute + Tags bazel.StringListAttribute } type javaAidlLibraryAttributes struct { Deps bazel.LabelListAttribute + Tags bazel.StringListAttribute } // bp2BuildJavaInfo has information needed for the conversion of java*_modules @@ -2700,6 +2702,8 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) return android.IsConvertedToAidlLibrary(ctx, src.OriginalModuleName) }) + apexAvailableTags := android.ApexAvailableTags(ctx.Module()) + if !aidlSrcs.IsEmpty() { aidlLibName := m.Name() + "_aidl_library" ctx.CreateBazelTargetModule( @@ -2710,6 +2714,7 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) android.CommonAttributes{Name: aidlLibName}, &aidlLibraryAttributes{ Srcs: aidlSrcs, + Tags: apexAvailableTags, }, ) aidlLibs.Add(&bazel.LabelAttribute{Value: &bazel.Label{Label: ":" + aidlLibName}}) @@ -2724,6 +2729,7 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) android.CommonAttributes{Name: javaAidlLibName}, &javaAidlLibraryAttributes{ Deps: aidlLibs, + Tags: apexAvailableTags, }, ) |