diff options
| author | 2020-01-07 09:34:44 -0800 | |
|---|---|---|
| committer | 2020-01-07 20:14:14 +0000 | |
| commit | 07c88569041b4026775ee124bb9edd4b26347c33 (patch) | |
| tree | ea2390b8128c6a97ae413e4042bd6a0c74eb9444 /java/sdk.go | |
| parent | 99d522b5df5aa93b17603edcd20829d2ebb08939 (diff) | |
Delay invalid sdk_version error for AllowMissingDependencies
Unbundled builds set AllowMissingDependencies and attempt to use
prebuilts for some jars. Delay the errors for missing jars for
modules with invalid sdk_version values in unbundled builds so
that they only block the build if those modules are built.
Also fix some error messages to show the original sdk_version
value.
Bug: 146513037
Test: m TARGET_BUILD_APPS=Camera2
Change-Id: I1812ef6dc80895f7a2162a8bdbf2c5067755e9a0
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/sdk.go b/java/sdk.go index c04880549..66eb284ba 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -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{} } |