From 00b206ee23e5dea6ce3785d2e23b172b0fc5a66f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 26 May 2020 10:10:17 +0100 Subject: [PATCH] java_sdk_library: Simplify SdkLibrary.sdkJars The expression !sdkVersion.specified() is equivalent to the following: !sdkVersion.valid() || sdkVersion.kind == sdkPrivate That means that the else if clause "sdkVersion.kind == sdkPrivate" will never be reached so it was removed. There is also no need to check sdkVersion.valid() as that will already have been checked, and an error reported, before this code has been called. Therefore that has been removed. Bug: 148080325 Test: m nothing Merged-In: Ib7c544b48dfb53bad3e15f9f73f71bd05cff9b49 Change-Id: Ib7c544b48dfb53bad3e15f9f73f71bd05cff9b49 (cherry picked from commit c91f5d0cc7d97dde90170da494fc1a22b6d5014e) --- java/sdk_library.go | 7 ++++--- 1 file 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)