diff options
| author | 2022-01-10 22:35:15 +0000 | |
|---|---|---|
| committer | 2022-01-10 22:35:15 +0000 | |
| commit | 0d9bf06f35c5073df5d9d8b38a787e3604260bd6 (patch) | |
| tree | f6c67cc0b86bca843000171513a3e3111e66884e /java/java.go | |
| parent | 51c8d94d37bebe6b2512d7eac9f21c1e012191a6 (diff) | |
| parent | e73c046d054447604bac91f59f154cd41d6721f2 (diff) | |
Merge "Convert javacflags -> javacopts for java_binary_host" am: 88a1b9da85 am: a3b597cacb am: e73c046d05
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940313
Change-Id: Ibab7a895dec1f6136501461bd5fac94f587a7d6d
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 9b4a005f0..73fd9c226 100644 --- a/java/java.go +++ b/java/java.go @@ -24,6 +24,7 @@ import ( "strings" "android/soong/bazel" + "github.com/google/blueprint" "github.com/google/blueprint/proptools" @@ -2000,6 +2001,7 @@ type javaBinaryHostAttributes struct { Deps bazel.LabelListAttribute Main_class string Jvm_flags bazel.StringListAttribute + Javacopts bazel.StringListAttribute } // JavaBinaryHostBp2Build is for java_binary_host bp2build. @@ -2021,6 +2023,10 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) { Main_class: mainClass, } + if m.properties.Javacflags != nil { + attrs.Javacopts = bazel.MakeStringListAttribute(m.properties.Javacflags) + } + // Attribute deps deps := []string{} if m.properties.Static_libs != nil { |