Merge "Allow modules with empty sdk_version in unbundled builds"

1 files changed, 1 insertions, 7 deletions

diff --git a/java/java.go b/java/java.go
index dbb755b9f..805e06a17 100644
--- a/java/java.go
+++ b/java/java.go
@@ -236,13 +236,7 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
 		}
 	}
 
-	if ctx.AConfig().UnbundledBuild() {
-		if v == "" {
-			if ctx, ok := ctx.(android.ModuleContext); ok {
-				ctx.AddMissingDependencies([]string{"sdk_version_must_be_set_for_modules_used_in_unbundled_builds"})
-			}
-			return sdkDep{}
-		}
+	if ctx.AConfig().UnbundledBuild() && v != "" {
 		return toFile(v)
 	}