Merge "Remove hidden_api_packages as it is no longer needed" into main am: 2f867fd9ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3165142 Change-Id: Id0fa3c9b9b06bf4e766c63fec8321f2a6fb46151 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -538,9 +538,6 @@ type sdkLibraryProperties struct {
|
|||||||
// of the API.
|
// of the API.
|
||||||
Api_packages []string
|
Api_packages []string
|
||||||
|
|
||||||
// list of package names that must be hidden from the API
|
|
||||||
Hidden_api_packages []string
|
|
||||||
|
|
||||||
// the relative path to the directory containing the api specification files.
|
// the relative path to the directory containing the api specification files.
|
||||||
// Defaults to "api".
|
// Defaults to "api".
|
||||||
Api_dir *string
|
Api_dir *string
|
||||||
@@ -1966,10 +1963,6 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC
|
|||||||
if len(module.sdkLibraryProperties.Api_packages) != 0 {
|
if len(module.sdkLibraryProperties.Api_packages) != 0 {
|
||||||
droidstubsArgs = append(droidstubsArgs, "--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 {
|
|
||||||
droidstubsArgs = append(droidstubsArgs,
|
|
||||||
android.JoinWithPrefix(module.sdkLibraryProperties.Hidden_api_packages, " --hide-package "))
|
|
||||||
}
|
|
||||||
droidstubsArgs = append(droidstubsArgs, module.sdkLibraryProperties.Droiddoc_options...)
|
droidstubsArgs = append(droidstubsArgs, module.sdkLibraryProperties.Droiddoc_options...)
|
||||||
disabledWarnings := []string{"HiddenSuperclass"}
|
disabledWarnings := []string{"HiddenSuperclass"}
|
||||||
if proptools.BoolDefault(module.sdkLibraryProperties.Api_lint.Legacy_errors_allowed, true) {
|
if proptools.BoolDefault(module.sdkLibraryProperties.Api_lint.Legacy_errors_allowed, true) {
|
||||||
|
Reference in New Issue
Block a user