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

Merge "java_sdk_library: Allow creation of impl shared library to be disabled"

Browse Source
This commit is contained in:
Treehugger Robot
2020-01-05 18:26:27 +00:00
committed by Gerrit Code Review
parent 7e96dac325 43db9bee5e
commit bcb6041b2a
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
java/sdk_library.go
View File

@@ -110,6 +110,9 @@ type sdkLibraryProperties struct {
// Defaults to "api". // Defaults to "api".
Api_dir *string Api_dir *string
// If set to true there is no runtime library.
Api_only *bool
// local files that are used within user customized droiddoc options. // local files that are used within user customized droiddoc options.
Droiddoc_option_files []string Droiddoc_option_files []string
@@ -183,7 +186,10 @@ func (module *SdkLibrary) DepsMutator(ctx android.BottomUpMutatorContext) {
} }
func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
module.Library.GenerateAndroidBuildActions(ctx) // Don't build an implementation library if this is api only.
if !proptools.Bool(module.sdkLibraryProperties.Api_only) {
module.Library.GenerateAndroidBuildActions(ctx)
}
module.buildPermissionsFile(ctx) module.buildPermissionsFile(ctx)
@@ -247,6 +253,9 @@ func (module *SdkLibrary) OutputFiles(tag string) (android.Paths, error) {
} }
func (module *SdkLibrary) AndroidMkEntries() []android.AndroidMkEntries { func (module *SdkLibrary) AndroidMkEntries() []android.AndroidMkEntries {
if proptools.Bool(module.sdkLibraryProperties.Api_only) {
return nil
}
entriesList := module.Library.AndroidMkEntries() entriesList := module.Library.AndroidMkEntries()
entries := &entriesList[0] entries := &entriesList[0]
entries.Required = append(entries.Required, module.xmlFileName()) entries.Required = append(entries.Required, module.xmlFileName())
@@ -773,16 +782,18 @@ func (module *SdkLibrary) CreateInternalModules(mctx android.LoadHookContext) {
// for test API stubs // for test API stubs
module.createStubsLibrary(mctx, apiScopeTest) module.createStubsLibrary(mctx, apiScopeTest)
module.createStubsSources(mctx, apiScopeTest) module.createStubsSources(mctx, apiScopeTest)
// for runtime
module.createXmlFile(mctx)
} }
// record java_sdk_library modules so that they are exported to make if !proptools.Bool(module.sdkLibraryProperties.Api_only) {
javaSdkLibraries := javaSdkLibraries(mctx.Config()) // for runtime
javaSdkLibrariesLock.Lock() module.createXmlFile(mctx)
defer javaSdkLibrariesLock.Unlock()
*javaSdkLibraries = append(*javaSdkLibraries, module.BaseModuleName()) // record java_sdk_library modules so that they are exported to make
javaSdkLibraries := javaSdkLibraries(mctx.Config())
javaSdkLibrariesLock.Lock()
defer javaSdkLibrariesLock.Unlock()
*javaSdkLibraries = append(*javaSdkLibraries, module.BaseModuleName())
}
} }
func (module *SdkLibrary) InitSdkLibraryProperties() { func (module *SdkLibrary) InitSdkLibraryProperties() {