summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorInseob Kim <inseob@google.com>2020-01-15 00:32:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-01-15 00:32:00 +0000
commita46c2b1994c455da7519eb5f2313e043e8d97464 (patch)
treeba812be7551c2506668f2c9436cca8f526332ecb /java/java.go
parentee76fba90541fc724b4260186eeb01a23b065789 (diff)
parentc52395135f146a018c0a6fe70084832e5a5d810f (diff)
Merge "Allow sdk and core modules to use sysprop_library"
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go7
1 files changed, 2 insertions, 5 deletions
diff --git a/java/java.go b/java/java.go
index a546cd524..d0088960b 100644
--- a/java/java.go
+++ b/java/java.go
@@ -619,12 +619,9 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
}
linkType, _ := j.getLinkType(ctx.ModuleName())
- if linkType == javaSystem {
+ // only platform modules can use internal props
+ if linkType != javaPlatform {
ret[idx] = stub
- } else if linkType != javaPlatform {
- ctx.PropertyErrorf("sdk_version",
- "can't link against sysprop_library %q from a module using public or core API",
- lib)
}
}