Merge "Allow sdk and core modules to use sysprop_library" am: a46c2b1994 am: ed000d7832
Change-Id: Ib49159f5bbfedd318866c8ccf939bb5e44233325
diff --git a/java/java.go b/java/java.go
index a546cd5..d008896 100644
--- a/java/java.go
+++ b/java/java.go
@@ -619,12 +619,9 @@
}
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)
}
}