diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/config.go | 10 | ||||
| -rw-r--r-- | java/droiddoc.go | 2 | ||||
| -rw-r--r-- | java/hiddenapi_singleton.go | 2 | ||||
| -rw-r--r-- | java/java.go | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/java/config/config.go b/java/config/config.go index 333de32d6..fee6341c3 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -124,7 +124,7 @@ func init() { if ctx.Config().UnbundledBuild() { return "prebuilts/build-tools/common/framework/" + turbine } else { - return pctx.HostJavaToolPath(ctx, turbine).String() + return ctx.Config().HostJavaToolPath(ctx, turbine).String() } }) @@ -170,7 +170,7 @@ func hostBinToolVariableWithSdkToolsPrebuilt(name, tool string) { if ctx.Config().UnbundledBuild() || ctx.Config().IsPdkBuild() { return filepath.Join("prebuilts/sdk/tools", runtime.GOOS, "bin", tool) } else { - return pctx.HostBinToolPath(ctx, tool).String() + return ctx.Config().HostToolPath(ctx, tool).String() } }) } @@ -180,7 +180,7 @@ func hostJavaToolVariableWithSdkToolsPrebuilt(name, tool string) { if ctx.Config().UnbundledBuild() || ctx.Config().IsPdkBuild() { return filepath.Join("prebuilts/sdk/tools/lib", tool+".jar") } else { - return pctx.HostJavaToolPath(ctx, tool+".jar").String() + return ctx.Config().HostJavaToolPath(ctx, tool+".jar").String() } }) } @@ -194,7 +194,7 @@ func hostJNIToolVariableWithSdkToolsPrebuilt(name, tool string) { } return filepath.Join("prebuilts/sdk/tools", runtime.GOOS, "lib64", tool+ext) } else { - return pctx.HostJNIToolPath(ctx, tool).String() + return ctx.Config().HostJNIToolPath(ctx, tool).String() } }) } @@ -204,7 +204,7 @@ func hostBinToolVariableWithBuildToolsPrebuilt(name, tool string) { if ctx.Config().UnbundledBuild() || ctx.Config().IsPdkBuild() { return filepath.Join("prebuilts/build-tools", ctx.Config().PrebuiltOS(), "bin", tool) } else { - return pctx.HostBinToolPath(ctx, tool).String() + return ctx.Config().HostToolPath(ctx, tool).String() } }) } diff --git a/java/droiddoc.go b/java/droiddoc.go index 45a72e14d..76cdaeac6 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -2000,6 +2000,6 @@ func (mt *droidStubsSdkMemberType) BuildSnapshot(sdkModuleContext android.Module snapshotRelativeDir := filepath.Join("java", d.Name()+"_stubs_sources") builder.UnzipToSnapshot(stubsSrcJar, snapshotRelativeDir) - pbm := builder.AddPrebuiltModule(sdkModuleContext.OtherModuleName(d), "prebuilt_stubs_sources") + pbm := builder.AddPrebuiltModule(member, "prebuilt_stubs_sources") pbm.AddProperty("srcs", []string{snapshotRelativeDir}) } diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index c0ef444fc..ad84cdea2 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -190,7 +190,7 @@ func stubFlagsRule(ctx android.SingletonContext) { rule.MissingDeps(missingDeps) rule.Command(). - Tool(pctx.HostBinToolPath(ctx, "hiddenapi")). + Tool(ctx.Config().HostToolPath(ctx, "hiddenapi")). Text("list"). FlagForEachInput("--boot-dex=", bootDexJars). FlagWithInputList("--public-stub-classpath=", publicStubPaths, ":"). diff --git a/java/java.go b/java/java.go index f933d8dac..f58e5ba24 100644 --- a/java/java.go +++ b/java/java.go @@ -1760,7 +1760,7 @@ func (mt *librarySdkMemberType) buildSnapshot( } } - module := builder.AddPrebuiltModule(sdkModuleContext.OtherModuleName(j), "java_import") + module := builder.AddPrebuiltModule(member, "java_import") module.AddProperty("jars", []string{snapshotRelativeJavaLibPath}) } |