diff options
| author | Colin Cross <ccross@android.com> | 2018-02-23 02:38:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-23 02:38:58 +0000 |
| commit | 945aebf48e4469f05c20dfe63a94c4a37ad790cf (patch) | |
| tree | 439c9aae14934eda141996bf5843be26cc387137 /java/java.go | |
| parent | 230c992943c6362911f6e2eec619d3e2b5e6d8a4 (diff) | |
| parent | b3407069ee328b17f1e38d380003a26379b3cf7a (diff) | |
| download | build_soong-945aebf48e4469f05c20dfe63a94c4a37ad790cf.tar.gz build_soong-945aebf48e4469f05c20dfe63a94c4a37ad790cf.tar.bz2 build_soong-945aebf48e4469f05c20dfe63a94c4a37ad790cf.zip | |
Merge changes If1894fd9,Id7925999,I4fe11c3f,Iea2b0781,Id2c0a503 am: 1b5599e462
am: b3407069ee
Change-Id: Ib0f7f8e93842cea36b915c1e10929f96249c20e3
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
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()) } |