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

Change link type rule

Browse Source 
If linkType of a module is javaPlatform, the module will link to
<lib>.impl instead of <lib>.stubs.system.

Bug: 77577799
Test: make -j
Change-Id: I2a9a0ec7c76c0fc304935f16c4c371aea39bffd6
This commit is contained in:
Sundong Ahn
2018-07-06 11:20:23 +09:00
parent 7f1c57ee33
commit 57368eb515
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/sdk_library.go
View File

@@ -46,6 +46,7 @@ var (
publicApiStubsTag = dependencyTag{name: "public"} publicApiStubsTag = dependencyTag{name: "public"}
systemApiStubsTag = dependencyTag{name: "system"} systemApiStubsTag = dependencyTag{name: "system"}
testApiStubsTag = dependencyTag{name: "test"} testApiStubsTag = dependencyTag{name: "test"}
implLibTag = dependencyTag{name: "platform"}
) )
type apiScope int type apiScope int
@@ -127,6 +128,7 @@ type sdkLibrary struct {
publicApiStubsPath android.Paths publicApiStubsPath android.Paths
systemApiStubsPath android.Paths systemApiStubsPath android.Paths
testApiStubsPath android.Paths testApiStubsPath android.Paths
implLibPath android.Paths
} }
func (module *sdkLibrary) DepsMutator(ctx android.BottomUpMutatorContext) { func (module *sdkLibrary) DepsMutator(ctx android.BottomUpMutatorContext) {
@@ -134,24 +136,27 @@ func (module *sdkLibrary) DepsMutator(ctx android.BottomUpMutatorContext) {
ctx.AddDependency(ctx.Module(), publicApiStubsTag, module.stubsName(apiScopePublic)) ctx.AddDependency(ctx.Module(), publicApiStubsTag, module.stubsName(apiScopePublic))
ctx.AddDependency(ctx.Module(), systemApiStubsTag, module.stubsName(apiScopeSystem)) ctx.AddDependency(ctx.Module(), systemApiStubsTag, module.stubsName(apiScopeSystem))
ctx.AddDependency(ctx.Module(), testApiStubsTag, module.stubsName(apiScopeTest)) ctx.AddDependency(ctx.Module(), testApiStubsTag, module.stubsName(apiScopeTest))
ctx.AddDependency(ctx.Module(), implLibTag, module.implName())
} }
func (module *sdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (module *sdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// Record the paths to the header jars of the stubs library. // Record the paths to the header jars of the library (stubs and impl).
// When this java_sdk_library is dependened from others via "libs" property, // When this java_sdk_library is dependened from others via "libs" property,
// the recorded paths will be returned depending on the link type of the caller. // the recorded paths will be returned depending on the link type of the caller.
ctx.VisitDirectDeps(func(to android.Module) { ctx.VisitDirectDeps(func(to android.Module) {
otherName := ctx.OtherModuleName(to) otherName := ctx.OtherModuleName(to)
tag := ctx.OtherModuleDependencyTag(to) tag := ctx.OtherModuleDependencyTag(to)
if stubs, ok := to.(Dependency); ok { if lib, ok := to.(Dependency); ok {
switch tag { switch tag {
case publicApiStubsTag: case publicApiStubsTag:
module.publicApiStubsPath = stubs.HeaderJars() module.publicApiStubsPath = lib.HeaderJars()
case systemApiStubsTag: case systemApiStubsTag:
module.systemApiStubsPath = stubs.HeaderJars() module.systemApiStubsPath = lib.HeaderJars()
case testApiStubsTag: case testApiStubsTag:
module.testApiStubsPath = stubs.HeaderJars() module.testApiStubsPath = lib.HeaderJars()
case implLibTag:
module.implLibPath = lib.HeaderJars()
default: default:
ctx.ModuleErrorf("depends on module %q of unknown tag %q", otherName, tag) ctx.ModuleErrorf("depends on module %q of unknown tag %q", otherName, tag)
} }
@@ -543,8 +548,10 @@ func (module *sdkLibrary) createXmlFile(mctx android.TopDownMutatorContext) {
// to satisfy SdkLibraryDependency interface // to satisfy SdkLibraryDependency interface
func (module *sdkLibrary) HeaderJars(linkType linkType) android.Paths { func (module *sdkLibrary) HeaderJars(linkType linkType) android.Paths {
// This module is just a wrapper for the stubs. // This module is just a wrapper for the stubs.
if linkType == javaSystem || linkType == javaPlatform { if linkType == javaSystem {
return module.systemApiStubsPath return module.systemApiStubsPath
} else if linkType == javaPlatform {
return module.implLibPath
} else { } else {
return module.publicApiStubsPath return module.publicApiStubsPath
} }