openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove draft API support." am: 7548b1ad05 am: 0ccb169046 am: c1499a90e2 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674968

Change-Id: I281cb957b9214fdd9d90c6ec6e95c5c69a4f5c96
This commit is contained in:
Treehugger Robot 2021-04-16 00:27:22 +00:00 committed by Automerger Merge Worker
parent 211b48731f c1499a90e2
commit 2619faa441
6 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@ -1295,10 +1295,6 @@ func (c *config) AmlAbis() bool {
return Bool(c.productVariables.Aml_abis)
}
func (c *config) ExcludeDraftNdkApis() bool {
return Bool(c.productVariables.Exclude_draft_ndk_apis)
}
func (c *config) FlattenApex() bool {
return Bool(c.productVariables.Flatten_apex)
}

3
android/variable.go
View File

@ -332,8 +332,7 @@ type productVariables struct {
VendorVars map[string]map[string]string `json:",omitempty"`
Ndk_abis *bool `json:",omitempty"`
Exclude_draft_ndk_apis *bool `json:",omitempty"`
Ndk_abis *bool `json:",omitempty"`
Flatten_apex *bool `json:",omitempty"`
ForceApexSymlinkOptimization *bool `json:",omitempty"`

15
cc/ndk_headers.go
View File

@ -75,11 +75,6 @@ type headerProperties struct {
// Path to the NOTICE file associated with the headers.
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 {
@ -184,11 +179,6 @@ type versionedHeaderProperties struct {
// Path to the NOTICE file associated with the headers.
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:
@ -311,11 +301,6 @@ type preprocessedHeadersProperties struct {
// Path to the NOTICE file associated with the headers.
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 {

5
cc/ndk_library.go
View File

@ -78,11 +78,6 @@ type libraryProperties struct {
// used. This is only needed to work around platform bugs like
// https://github.com/android-ndk/ndk/issues/265.
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 {

16
cc/ndk_sysroot.go
View File

@ -104,38 +104,22 @@ func (n *ndkSingleton) GenerateBuildActions(ctx android.SingletonContext) {
}
if m, ok := module.(*headerModule); ok {
if ctx.Config().ExcludeDraftNdkApis() && m.properties.Draft {
return
}
installPaths = append(installPaths, m.installPaths...)
licensePaths = append(licensePaths, m.licensePath)
}
if m, ok := module.(*versionedHeaderModule); ok {
if ctx.Config().ExcludeDraftNdkApis() && m.properties.Draft {
return
}
installPaths = append(installPaths, m.installPaths...)
licensePaths = append(licensePaths, m.licensePath)
}
if m, ok := module.(*preprocessedHeadersModule); ok {
if ctx.Config().ExcludeDraftNdkApis() && m.properties.Draft {
return
}
installPaths = append(installPaths, m.installPaths...)
licensePaths = append(licensePaths, m.licensePath)
}
if m, ok := module.(*Module); ok {
if installer, ok := m.installer.(*stubDecorator); ok && m.library.buildStubs() {
if ctx.Config().ExcludeDraftNdkApis() &&
installer.properties.Draft {
return
}
installPaths = append(installPaths, installer.installPath)
}

1
scripts/build-ndk-prebuilts.sh
View File

@ -54,7 +54,6 @@ cat > ${SOONG_OUT}/soong.variables << EOF
"Safestack": false,
"Ndk_abis": true,
"Exclude_draft_ndk_apis": true,
"VendorVars": {
"art_module": {