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

Merge changes I96f0eb03,Ie883eb45 am: 5bf1480218

Browse Source 
Change-Id: I677d267ac7457752fdbeb14b96a4d138a2c2adde
This commit is contained in:
Treehugger Robot
2020-04-08 00:54:56 +00:00
committed by Automerger Merge Worker
parent 83bb39c097 5bf1480218
commit 3893c6743b
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
java/sdk_library.go
View File

@@ -86,6 +86,9 @@ type apiScope struct {
// *current. Older stubs library built with a numbered SDK version is created from // *current. Older stubs library built with a numbered SDK version is created from
// the prebuilt jar. // the prebuilt jar.
sdkVersion string sdkVersion string
// Extra arguments to pass to droidstubs for this scope.
droidstubsArgs []string
} }
// Initialize a scope, creating and adding appropriate dependency tags // Initialize a scope, creating and adding appropriate dependency tags
@@ -131,6 +134,7 @@ var (
moduleSuffix: sdkSystemApiSuffix, moduleSuffix: sdkSystemApiSuffix,
apiFileMakeVariableSuffix: "_SYSTEM", apiFileMakeVariableSuffix: "_SYSTEM",
sdkVersion: "system_current", sdkVersion: "system_current",
droidstubsArgs: []string{"-showAnnotation android.annotation.SystemApi"},
}) })
apiScopeTest = initApiScope(&apiScope{ apiScopeTest = initApiScope(&apiScope{
name: "test", name: "test",
@@ -138,6 +142,7 @@ var (
moduleSuffix: sdkTestApiSuffix, moduleSuffix: sdkTestApiSuffix,
apiFileMakeVariableSuffix: "_TEST", apiFileMakeVariableSuffix: "_TEST",
sdkVersion: "test_current", sdkVersion: "test_current",
droidstubsArgs: []string{"-showAnnotation android.annotation.TestApi"},
}) })
allApiScopes = apiScopes{ allApiScopes = apiScopes{
apiScopePublic, apiScopePublic,
@@ -458,7 +463,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc
mctx.CreateModule(LibraryFactory, &props) mctx.CreateModule(LibraryFactory, &props)
} }
// Creates a droiddoc module that creates stubs source files from the given full source // Creates a droidstubs module that creates stubs source files from the given full source
// files // files
func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiScope *apiScope) { func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiScope *apiScope) {
props := struct { props := struct {
@@ -516,15 +521,15 @@ func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiSc
props.Merge_annotations_dirs = module.sdkLibraryProperties.Merge_annotations_dirs props.Merge_annotations_dirs = module.sdkLibraryProperties.Merge_annotations_dirs
props.Merge_inclusion_annotations_dirs = module.sdkLibraryProperties.Merge_inclusion_annotations_dirs props.Merge_inclusion_annotations_dirs = module.sdkLibraryProperties.Merge_inclusion_annotations_dirs
droiddocArgs := []string{} droidstubsArgs := []string{}
if len(module.sdkLibraryProperties.Api_packages) != 0 { if len(module.sdkLibraryProperties.Api_packages) != 0 {
droiddocArgs = append(droiddocArgs, "--stub-packages "+strings.Join(module.sdkLibraryProperties.Api_packages, ":")) droidstubsArgs = append(droidstubsArgs, "--stub-packages "+strings.Join(module.sdkLibraryProperties.Api_packages, ":"))
} }
if len(module.sdkLibraryProperties.Hidden_api_packages) != 0 { if len(module.sdkLibraryProperties.Hidden_api_packages) != 0 {
droiddocArgs = append(droiddocArgs, droidstubsArgs = append(droidstubsArgs,
android.JoinWithPrefix(module.sdkLibraryProperties.Hidden_api_packages, " --hide-package ")) android.JoinWithPrefix(module.sdkLibraryProperties.Hidden_api_packages, " --hide-package "))
} }
droiddocArgs = append(droiddocArgs, module.sdkLibraryProperties.Droiddoc_options...) droidstubsArgs = append(droidstubsArgs, module.sdkLibraryProperties.Droiddoc_options...)
disabledWarnings := []string{ disabledWarnings := []string{
"MissingPermission", "MissingPermission",
"BroadcastBehavior", "BroadcastBehavior",
@@ -536,16 +541,12 @@ func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiSc
"Todo", "Todo",
"Typo", "Typo",
} }
droiddocArgs = append(droiddocArgs, android.JoinWithPrefix(disabledWarnings, "--hide ")) droidstubsArgs = append(droidstubsArgs, android.JoinWithPrefix(disabledWarnings, "--hide "))
switch apiScope { // Add in scope specific arguments.
case apiScopeSystem: droidstubsArgs = append(droidstubsArgs, apiScope.droidstubsArgs...)
droiddocArgs = append(droiddocArgs, "-showAnnotation android.annotation.SystemApi")
case apiScopeTest:
droiddocArgs = append(droiddocArgs, " -showAnnotation android.annotation.TestApi")
}
props.Arg_files = module.sdkLibraryProperties.Droiddoc_option_files props.Arg_files = module.sdkLibraryProperties.Droiddoc_option_files
props.Args = proptools.StringPtr(strings.Join(droiddocArgs, " ")) props.Args = proptools.StringPtr(strings.Join(droidstubsArgs, " "))
// List of APIs identified from the provided source files are created. They are later // List of APIs identified from the provided source files are created. They are later
// compared against to the not-yet-released (a.k.a current) list of APIs and to the // compared against to the not-yet-released (a.k.a current) list of APIs and to the