Remove draft API support.
This is unused and doesn't work with our current API review process anyway (un-drafting an API won't be flagged for API council review). Test: treehugger Bug: None Change-Id: I6d8fcc9885b82dac5ada7772d9e3fb9101524ece
This commit is contained in:
parent
38e55b9242
commit
d05ba00415
6 changed files with 1 additions and 43 deletions
|
@ -1295,10 +1295,6 @@ func (c *config) AmlAbis() bool {
|
||||||
return Bool(c.productVariables.Aml_abis)
|
return Bool(c.productVariables.Aml_abis)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *config) ExcludeDraftNdkApis() bool {
|
|
||||||
return Bool(c.productVariables.Exclude_draft_ndk_apis)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (c *config) FlattenApex() bool {
|
func (c *config) FlattenApex() bool {
|
||||||
return Bool(c.productVariables.Flatten_apex)
|
return Bool(c.productVariables.Flatten_apex)
|
||||||
}
|
}
|
||||||
|
|
|
@ -331,8 +331,7 @@ type productVariables struct {
|
||||||
|
|
||||||
VendorVars map[string]map[string]string `json:",omitempty"`
|
VendorVars map[string]map[string]string `json:",omitempty"`
|
||||||
|
|
||||||
Ndk_abis *bool `json:",omitempty"`
|
Ndk_abis *bool `json:",omitempty"`
|
||||||
Exclude_draft_ndk_apis *bool `json:",omitempty"`
|
|
||||||
|
|
||||||
Flatten_apex *bool `json:",omitempty"`
|
Flatten_apex *bool `json:",omitempty"`
|
||||||
ForceApexSymlinkOptimization *bool `json:",omitempty"`
|
ForceApexSymlinkOptimization *bool `json:",omitempty"`
|
||||||
|
|
|
@ -75,11 +75,6 @@ type headerProperties struct {
|
||||||
|
|
||||||
// Path to the NOTICE file associated with the headers.
|
// Path to the NOTICE file associated with the headers.
|
||||||
License *string `android:"path"`
|
License *string `android:"path"`
|
||||||
|
|
||||||
// True if this API is not yet ready to be shipped in the NDK. It will be
|
|
||||||
// available in the platform for testing, but will be excluded from the
|
|
||||||
// sysroot provided to the NDK proper.
|
|
||||||
Draft bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type headerModule struct {
|
type headerModule struct {
|
||||||
|
@ -184,11 +179,6 @@ type versionedHeaderProperties struct {
|
||||||
|
|
||||||
// Path to the NOTICE file associated with the headers.
|
// Path to the NOTICE file associated with the headers.
|
||||||
License *string
|
License *string
|
||||||
|
|
||||||
// True if this API is not yet ready to be shipped in the NDK. It will be
|
|
||||||
// available in the platform for testing, but will be excluded from the
|
|
||||||
// sysroot provided to the NDK proper.
|
|
||||||
Draft bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Like ndk_headers, but preprocesses the headers with the bionic versioner:
|
// Like ndk_headers, but preprocesses the headers with the bionic versioner:
|
||||||
|
@ -311,11 +301,6 @@ type preprocessedHeadersProperties struct {
|
||||||
|
|
||||||
// Path to the NOTICE file associated with the headers.
|
// Path to the NOTICE file associated with the headers.
|
||||||
License *string
|
License *string
|
||||||
|
|
||||||
// True if this API is not yet ready to be shipped in the NDK. It will be
|
|
||||||
// available in the platform for testing, but will be excluded from the
|
|
||||||
// sysroot provided to the NDK proper.
|
|
||||||
Draft bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type preprocessedHeadersModule struct {
|
type preprocessedHeadersModule struct {
|
||||||
|
|
|
@ -78,11 +78,6 @@ type libraryProperties struct {
|
||||||
// used. This is only needed to work around platform bugs like
|
// used. This is only needed to work around platform bugs like
|
||||||
// https://github.com/android-ndk/ndk/issues/265.
|
// https://github.com/android-ndk/ndk/issues/265.
|
||||||
Unversioned_until *string
|
Unversioned_until *string
|
||||||
|
|
||||||
// True if this API is not yet ready to be shipped in the NDK. It will be
|
|
||||||
// available in the platform for testing, but will be excluded from the
|
|
||||||
// sysroot provided to the NDK proper.
|
|
||||||
Draft bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type stubDecorator struct {
|
type stubDecorator struct {
|
||||||
|
|
|
@ -104,38 +104,22 @@ func (n *ndkSingleton) GenerateBuildActions(ctx android.SingletonContext) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if m, ok := module.(*headerModule); ok {
|
if m, ok := module.(*headerModule); ok {
|
||||||
if ctx.Config().ExcludeDraftNdkApis() && m.properties.Draft {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
installPaths = append(installPaths, m.installPaths...)
|
installPaths = append(installPaths, m.installPaths...)
|
||||||
licensePaths = append(licensePaths, m.licensePath)
|
licensePaths = append(licensePaths, m.licensePath)
|
||||||
}
|
}
|
||||||
|
|
||||||
if m, ok := module.(*versionedHeaderModule); ok {
|
if m, ok := module.(*versionedHeaderModule); ok {
|
||||||
if ctx.Config().ExcludeDraftNdkApis() && m.properties.Draft {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
installPaths = append(installPaths, m.installPaths...)
|
installPaths = append(installPaths, m.installPaths...)
|
||||||
licensePaths = append(licensePaths, m.licensePath)
|
licensePaths = append(licensePaths, m.licensePath)
|
||||||
}
|
}
|
||||||
|
|
||||||
if m, ok := module.(*preprocessedHeadersModule); ok {
|
if m, ok := module.(*preprocessedHeadersModule); ok {
|
||||||
if ctx.Config().ExcludeDraftNdkApis() && m.properties.Draft {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
installPaths = append(installPaths, m.installPaths...)
|
installPaths = append(installPaths, m.installPaths...)
|
||||||
licensePaths = append(licensePaths, m.licensePath)
|
licensePaths = append(licensePaths, m.licensePath)
|
||||||
}
|
}
|
||||||
|
|
||||||
if m, ok := module.(*Module); ok {
|
if m, ok := module.(*Module); ok {
|
||||||
if installer, ok := m.installer.(*stubDecorator); ok && m.library.buildStubs() {
|
if installer, ok := m.installer.(*stubDecorator); ok && m.library.buildStubs() {
|
||||||
if ctx.Config().ExcludeDraftNdkApis() &&
|
|
||||||
installer.properties.Draft {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
installPaths = append(installPaths, installer.installPath)
|
installPaths = append(installPaths, installer.installPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,6 @@ cat > ${SOONG_OUT}/soong.variables << EOF
|
||||||
"Safestack": false,
|
"Safestack": false,
|
||||||
|
|
||||||
"Ndk_abis": true,
|
"Ndk_abis": true,
|
||||||
"Exclude_draft_ndk_apis": true,
|
|
||||||
|
|
||||||
"VendorVars": {
|
"VendorVars": {
|
||||||
"art_module": {
|
"art_module": {
|
||||||
|
|
Loading…
Reference in a new issue