Merge "Add path valid check" am: 10d21fdcb9

am: 24801a3980 Change-Id: I0d5ec500385106de4b1168cf4114be61aba40374
2019-02-28 18:56:11 -08:00
parent d26cc522ac 24801a3980
commit 37eed8fc81
1 changed files with 4 additions and 0 deletions
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -607,6 +607,10 @@ func (module *SdkLibrary) PrebuiltJars(ctx android.BaseContext, sdkVersion strin
 	dir := filepath.Join("prebuilts", "sdk", v, api)
 	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)
+		return nil
+	}
 	return android.Paths{jarPath.Path()}
 }