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

Delay invalid sdk_version error for AllowMissingDependencies

Browse Source 
am: 07c8856904

Change-Id: I166f7174b51c59b152123b5cdf7fd5ba464307d2
This commit is contained in:
Colin Cross
2020-01-07 12:19:16 -08:00
committed by android-build-merger
parent 540d35006f 07c8856904
commit 400665159a
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() { 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{} return sdkDep{}
} }
if !aidlPath.Valid() { 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{} 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") jar := filepath.Join(dir, module.BaseModuleName()+".jar")
jarPath := android.ExistentPathForSource(ctx, jar) jarPath := android.ExistentPathForSource(ctx, jar)
if !jarPath.Valid() { 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 nil
} }
return android.Paths{jarPath.Path()} return android.Paths{jarPath.Path()}