From c52395135f146a018c0a6fe70084832e5a5d810f Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Tue, 14 Jan 2020 15:36:21 +0900 Subject: [PATCH] Allow sdk and core modules to use sysprop_library This allows javaSdk and javaCore modules to link against Public stub of Platform owned sysprop_library. Bug: 141246285 Test: m nothing Change-Id: Ie11c43cc72ddd0ee13e4163955775c13eb9dbe92 --- java/java.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/java/java.go b/java/java.go index 5afdc2f6d..4c6a5a5ac 100644 --- a/java/java.go +++ b/java/java.go @@ -627,12 +627,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) } }