StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "java_sdk_library: Do not expose stubs implementation jar"

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-21 09:16:04 +00:00
committed by Gerrit Code Review
parent f716d58339 23970f4285
commit c912b4617e
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/sdk_library.go
View File

@@ -694,7 +694,7 @@ func (c *commonToSdkLibraryAndImport) findClosestScopePath(scope *apiScope) *sco
return nil return nil
} }
func (c *commonToSdkLibraryAndImport) sdkJarsCommon(ctx android.BaseModuleContext, sdkVersion sdkSpec, headerJars bool) android.Paths { func (c *commonToSdkLibraryAndImport) selectHeaderJarsForSdkVersion(ctx android.BaseModuleContext, sdkVersion sdkSpec) android.Paths {
// If a specific numeric version has been requested then use prebuilt versions of the sdk. // If a specific numeric version has been requested then use prebuilt versions of the sdk.
if sdkVersion.version.isNumbered() { if sdkVersion.version.isNumbered() {
@@ -725,11 +725,7 @@ func (c *commonToSdkLibraryAndImport) sdkJarsCommon(ctx android.BaseModuleContex
return nil return nil
} }
if headerJars { return paths.stubsHeaderPath
return paths.stubsHeaderPath
} else {
return paths.stubsImplPath
}
} }
type SdkLibrary struct { type SdkLibrary struct {
@@ -1200,7 +1196,7 @@ func (module *SdkLibrary) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkS
return module.HeaderJars() return module.HeaderJars()
} }
return module.sdkJarsCommon(ctx, sdkVersion, headerJars) return module.selectHeaderJarsForSdkVersion(ctx, sdkVersion)
} }
// to satisfy SdkLibraryDependency interface // to satisfy SdkLibraryDependency interface
@@ -1639,11 +1635,7 @@ func (module *sdkLibraryImport) GenerateAndroidBuildActions(ctx android.ModuleCo
} }
func (module *sdkLibraryImport) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkSpec) android.Paths { func (module *sdkLibraryImport) sdkJars(ctx android.BaseModuleContext, sdkVersion sdkSpec) android.Paths {
return module.selectHeaderJarsForSdkVersion(ctx, sdkVersion)
// The java_sdk_library_import can only ever give back header jars as it does not
// have an implementation jar.
headerJars := true
return module.sdkJarsCommon(ctx, sdkVersion, headerJars)
} }
// to satisfy SdkLibraryDependency interface // to satisfy SdkLibraryDependency interface