aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-02-22 11:47:25 -0800
committerColin Cross <ccross@android.com>2018-02-22 14:43:36 -0800
commit32f3898f0b61b27944ceff041d637c1af828cd86 (patch)
tree70a84d3c9a379d72c39e760f2dc85df582cc05e1 /java
parent2f2f24f775c1670c6a901a2f5f2e47dcaeb63c0d (diff)
downloadbuild_soong-32f3898f0b61b27944ceff041d637c1af828cd86.tar.gz
build_soong-32f3898f0b61b27944ceff041d637c1af828cd86.tar.bz2
build_soong-32f3898f0b61b27944ceff041d637c1af828cd86.zip
Remove unused intermediates parameter from ExistentPathForSource
Test: m checkbuild Change-Id: Id2c0a5039c2ec3b3795385c135ffec022ccd691e
Diffstat (limited to 'java')
-rw-r--r--java/java.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go
index 4a7d7043..ae48bd65 100644
--- a/java/java.go
+++ b/java/java.go
@@ -371,8 +371,8 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
jar = filepath.Join(dir, "core.jar")
}
aidl := filepath.Join(dir, "framework.aidl")
- jarPath := android.ExistentPathForSource(ctx, "sdkdir", jar)
- aidlPath := android.ExistentPathForSource(ctx, "sdkdir", aidl)
+ jarPath := android.ExistentPathForSource(ctx, jar)
+ aidlPath := android.ExistentPathForSource(ctx, aidl)
if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() {
return sdkDep{
@@ -530,7 +530,7 @@ func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Opt
flags = append(flags, android.JoinWithPrefix(j.exportAidlIncludeDirs.Strings(), "-I"))
flags = append(flags, android.JoinWithPrefix(aidlIncludes.Strings(), "-I"))
flags = append(flags, "-I"+android.PathForModuleSrc(ctx).String())
- if src := android.ExistentPathForSource(ctx, "", ctx.ModuleDir(), "src"); src.Valid() {
+ if src := android.ExistentPathForSource(ctx, ctx.ModuleDir(), "src"); src.Valid() {
flags = append(flags, "-I"+src.String())
}