diff options
| author | Alix <agespino@google.com> | 2023-03-06 19:43:55 +0000 |
|---|---|---|
| committer | Alix <agespino@google.com> | 2023-03-14 13:57:22 +0000 |
| commit | f848bf82254b25bba0166f451e0a88c6bee3d5e6 (patch) | |
| tree | 38b769ace44ac40853bb548b59d9a3eab336ada9 /java/java.go | |
| parent | 34127be4e98fe779dbd1ab492b0d0dd7f1d9447b (diff) | |
bp2build kotlinCFlags
for java_library, java_binary, android_app & android_library
Change-Id: Ia8dec7e7d497eb41b2d8dcd8c44c3090d1d3b4bd
Bug: 271265771
Test: go test ./bp2build
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index e8f78ba4a..15ee4a995 100644 --- a/java/java.go +++ b/java/java.go @@ -2787,11 +2787,12 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) depLabels.StaticDeps = bazel.MakeLabelListAttribute(staticDeps) hasKotlin := !kotlinSrcs.IsEmpty() + commonAttrs.kotlinAttributes = &kotlinAttributes{ + Kotlincflags: &m.properties.Kotlincflags, + } if len(m.properties.Common_srcs) != 0 { hasKotlin = true - commonAttrs.kotlinAttributes = &kotlinAttributes{ - bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs)), - } + commonAttrs.kotlinAttributes.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs)) } bp2BuildInfo := &bp2BuildJavaInfo{ @@ -2810,7 +2811,8 @@ type javaLibraryAttributes struct { } type kotlinAttributes struct { - Common_srcs bazel.LabelListAttribute + Common_srcs bazel.LabelListAttribute + Kotlincflags *[]string } func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { |