Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7548b1ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove draft API support."

parents 192131e3 d05ba004

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -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)

}

android/variable.go

+1 −2
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ type productVariables struct { 
	VendorVars map[string]map[string]string `json:",omitempty"`



	Ndk_abis *bool `json:",omitempty"`

	Exclude_draft_ndk_apis *bool `json:",omitempty"`



	Flatten_apex                 *bool `json:",omitempty"`

	ForceApexSymlinkOptimization *bool `json:",omitempty"`

cc/ndk_headers.go

+0 −15
Original line number Diff line number Diff line
@@ -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 {

cc/ndk_library.go

+0 −5
Original line number Diff line number Diff line
@@ -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 {

cc/ndk_sysroot.go

+0 −16
Original line number Diff line number Diff line
@@ -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)

			}