StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delay invalid sdk_version error for AllowMissingDependencies am: 07c8856904 am: 400665159a am: 9b47a016ab

Browse Source 
Change-Id: Ia1242d255232ef339bee8425f556b927cfd1fb49
This commit is contained in:
Automerger Merge Worker
2020-01-07 20:48:52 +00:00
parent 59dbe24228 9b47a016ab
commit 2a52cf8ae6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/sdk.go
View File

@@ -127,12 +127,12 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep
}
if !jarPath.Valid() {
ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, jar)
ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", sdk, jar)
return sdkDep{}
}
if !aidlPath.Valid() {
ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", v, aidl)
ctx.PropertyErrorf("sdk_version", "invalid sdk version %q, %q does not exist", sdk, aidl)
return sdkDep{}
}

6
java/sdk_library.go
View File

@@ -667,7 +667,11 @@ func (module *SdkLibrary) PrebuiltJars(ctx android.BaseModuleContext, sdkVersion
jar := filepath.Join(dir, module.BaseModuleName()+".jar")
jarPath := android.ExistentPathForSource(ctx, jar)
if !jarPath.Valid() {
ctx.PropertyErrorf("sdk_library", "invalid sdk version %q, %q does not exist", v, jar)
if ctx.Config().AllowMissingDependencies() {
return android.Paths{android.PathForSource(ctx, jar)}
} else {
ctx.PropertyErrorf("sdk_library", "invalid sdk version %q, %q does not exist", sdkVersion, jar)
}
return nil
}
return android.Paths{jarPath.Path()}