commit | b93479bed6a2d38276c815f93e4b0eaeb1f49f54 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 30 04:15:28 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Sep 30 04:15:28 2017 +0000 |
tree | 40cde2560e34a7ce56c8e78a496ff94ffb4d2ca1 | |
parent | 00be2b997a850987873d896a93482151777031df [diff] | |
parent | 8b9d37b40a52928545d233f545dd8a4795ddac12 [diff] |
Merge "Allow modules with empty sdk_version in unbundled builds"
diff --git a/java/java.go b/java/java.go index dbb755b..805e06a 100644 --- a/java/java.go +++ b/java/java.go
@@ -236,13 +236,7 @@ } } - 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) }