diff options
| author | 2020-05-27 06:37:56 +0000 | |
|---|---|---|
| committer | 2020-05-27 06:37:56 +0000 | |
| commit | 96d9fb7d33117f928b95d59c8c329eb66bb74e1b (patch) | |
| tree | 31f318a921f424e021d2cd62cb6dbdce551243eb /java/sdk_library.go | |
| parent | 6270b775deabcf35ae615f8274063ca5b3aff0bf (diff) | |
| parent | 00b206ee23e5dea6ce3785d2e23b172b0fc5a66f (diff) | |
Merge "java_sdk_library: Simplify SdkLibrary.sdkJars" into rvc-dev
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 0598e814e..74dbde898 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1298,14 +1298,15 @@ func PrebuiltJars(ctx android.BaseModuleContext, baseName string, s sdkSpec) and func (module *SdkLibrary) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkSpec, headerJars bool) android.Paths { // Check any special cases for java_sdk_library. - if !sdkVersion.specified() { + // + // Only allow access to the implementation library in the following condition: + // * No sdk_version specified on the referencing module. + if sdkVersion.kind == sdkPrivate { if headerJars { return module.HeaderJars() } else { return module.ImplementationJars() } - } else if sdkVersion.kind == sdkPrivate { - return module.HeaderJars() } return module.selectHeaderJarsForSdkVersion(ctx, sdkVersion) |