diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 99af2f5ab..38c89f4c8 100644 --- a/java/java.go +++ b/java/java.go @@ -574,7 +574,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { ctx.AddDependency(ctx.Module(), libTag, j.properties.Libs...) ctx.AddDependency(ctx.Module(), staticLibTag, j.properties.Static_libs...) ctx.AddFarVariationDependencies([]blueprint.Variation{ - {"arch", ctx.Config().BuildOsCommonVariant}, + {Mutator: "arch", Variation: ctx.Config().BuildOsCommonVariant}, }, annoTag, j.properties.Annotation_processors...) android.ExtractSourcesDeps(ctx, j.properties.Srcs) android.ExtractSourcesDeps(ctx, j.properties.Exclude_srcs) @@ -631,7 +631,8 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt aidlIncludes = append(aidlIncludes, android.PathsForSource(ctx, j.deviceProperties.Aidl.Include_dirs)...) - var flags []string + flags := []string{"-b"} + if aidlPreprocess.Valid() { flags = append(flags, "-p"+aidlPreprocess.String()) } else { @@ -693,7 +694,8 @@ func getLinkType(m *Module, name string) linkType { ver := m.sdkVersion() noStdLibs := Bool(m.properties.No_standard_libs) switch { - case name == "core.current.stubs" || ver == "core_current" || noStdLibs || name == "stub-annotations": + case name == "core.current.stubs" || ver == "core_current" || noStdLibs || name == "stub-annotations" || + name == "private-stub-annotations-jar": return javaCore case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_") || name == "metalava_android_system_stubs_current": return javaSystem |