From 8b9d37b40a52928545d233f545dd8a4795ddac12 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 22 Sep 2017 15:30:06 -0700 Subject: [PATCH] Allow modules with empty sdk_version in unbundled builds The apps build depends modules that have empty sdk_version. Let the behavior match make for now. Test: m -j TARGET_BUILD_APPS=Gallery2 Change-Id: Ie5545d2cd6b1268b0b3392dc0af2e4eb3d38a588 --- java/java.go | 8 +------- 1 file changed, 1 insertion(+), 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) }