tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build_soong/cc/linkable.go

83 lines
1.5 KiB
Go
Raw Normal View History

Add a common interface for cc linkable libraries. Adds an interface, CcLinkableInterface, for cc linkable dependencies which come from other toolchains such as Rust. Bug: 140726209 Test: Soong tests pass, rust modules still compile. Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-18 23:18:45 +02:00
package cc
import (
"github.com/google/blueprint"
"android/soong/android"
)
type LinkableInterface interface {
Module() android.Module
CcLibrary() bool
CcLibraryInterface() bool
OutputFile() android.OptionalPath
Allow cc modules to pull in rust includes. Make sure LinkabeInterfaces can export include dirs to cc modules. This fixes the Rust implementation and makes sure these are pulled in for cc modules. Bug: 144052093 Test: cc module depending on a rust library includes dirs correctly. Change-Id: I6b5d5e6ab6afb507178b4f2cbdc45f01031dbfe4
2019-11-07 04:15:49 +01:00
IncludeDirs() android.Paths
Add a common interface for cc linkable libraries. Adds an interface, CcLinkableInterface, for cc linkable dependencies which come from other toolchains such as Rust. Bug: 140726209 Test: Soong tests pass, rust modules still compile. Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-18 23:18:45 +02:00
SetDepsInLinkOrder([]android.Path)
GetDepsInLinkOrder() []android.Path
HasStaticVariant() bool
GetStaticVariant() LinkableInterface
Allow cc.LinkabeInterfaces to request "" variants. cc.LinkableInterfaces should be able to request if an empty variant is required from the LinkageMutator. We were previously assuming that if only static or shared libraries were being built, then we didn't need the empty variant. However this should be explicit to handle cases where the default set of variants being created may not include both static and shared libraries. Bug: 144861059 Test: m -j crosvm.experimental Change-Id: I66724bdc16ff350b06dfa4d049c82f33019979a5
2019-11-21 21:30:50 +01:00
NonCcVariants() bool
Add a common interface for cc linkable libraries. Adds an interface, CcLinkableInterface, for cc linkable dependencies which come from other toolchains such as Rust. Bug: 140726209 Test: Soong tests pass, rust modules still compile. Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-18 23:18:45 +02:00
StubsVersions() []string
Add support for Rust C libraries. Adds the ability for rust modules to be compiled as C libraries, and allows cc modules to depend on these rust-generated modules. This also means that soong-rust should not have any dependencies on soong-cc aside from what's required for testing. There's a couple small fixes included as well: - A bug in libNameFromFilePath that caused issues when library's had "lib" in their name. - VariantName is removed from rust library MutatedProperties since this was unused. Bug: 140726209 Test: Soong tests pass. Test: Example cc_binary can include a rust shared library as a dep. Test: m crosvm.experimental Change-Id: Ia7deed1345d2423001089014cc65ce7934123da4
2019-10-18 23:49:46 +02:00
BuildStubs() bool
Add a common interface for cc linkable libraries. Adds an interface, CcLinkableInterface, for cc linkable dependencies which come from other toolchains such as Rust. Bug: 140726209 Test: Soong tests pass, rust modules still compile. Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-18 23:18:45 +02:00
SetBuildStubs()
SetStubsVersions(string)
apex: choose stub according to min_sdk_version Native modules within APEX should be linked with proper stub version according to its min_sdk_version. For example, when min_sdk_version is set to "29", libfoo in the apex would be linked to libbar of version 29 from platform, even if it has a newer version like 30. Bug: 145796956 Test: m nothing (soong tests) Merged-In: I4a0b2002587bc24b7deeb5d59b6eeba5e1db5b1f Change-Id: I4a0b2002587bc24b7deeb5d59b6eeba5e1db5b1f (cherry picked from commit 03b5185b888f2d75b61916e37c8f366e10e7fd94) Exempt-From-Owner-Approval: got ORV already.
2020-02-26 14:45:42 +01:00
StubsVersion() string
Add support for Rust C libraries. Adds the ability for rust modules to be compiled as C libraries, and allows cc modules to depend on these rust-generated modules. This also means that soong-rust should not have any dependencies on soong-cc aside from what's required for testing. There's a couple small fixes included as well: - A bug in libNameFromFilePath that caused issues when library's had "lib" in their name. - VariantName is removed from rust library MutatedProperties since this was unused. Bug: 140726209 Test: Soong tests pass. Test: Example cc_binary can include a rust shared library as a dep. Test: m crosvm.experimental Change-Id: Ia7deed1345d2423001089014cc65ce7934123da4
2019-10-18 23:49:46 +02:00
HasStubsVariants() bool
SelectedStl() string
ApiLevel() string
Add a common interface for cc linkable libraries. Adds an interface, CcLinkableInterface, for cc linkable dependencies which come from other toolchains such as Rust. Bug: 140726209 Test: Soong tests pass, rust modules still compile. Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-18 23:18:45 +02:00
BuildStaticVariant() bool
BuildSharedVariant() bool
SetStatic()
SetShared()
Add support for Rust C libraries. Adds the ability for rust modules to be compiled as C libraries, and allows cc modules to depend on these rust-generated modules. This also means that soong-rust should not have any dependencies on soong-cc aside from what's required for testing. There's a couple small fixes included as well: - A bug in libNameFromFilePath that caused issues when library's had "lib" in their name. - VariantName is removed from rust library MutatedProperties since this was unused. Bug: 140726209 Test: Soong tests pass. Test: Example cc_binary can include a rust shared library as a dep. Test: m crosvm.experimental Change-Id: Ia7deed1345d2423001089014cc65ce7934123da4
2019-10-18 23:49:46 +02:00
Static() bool
Shared() bool
Toc() android.OptionalPath
Add ramdisk image. It is similar to recovery image. Test: m nothing -j Change-Id: I11389777c6bfb0c0d73bbb4c70091c1e70f44077
2020-01-22 00:53:22 +01:00
InRamdisk() bool
OnlyInRamdisk() bool
Add support for Rust C libraries. Adds the ability for rust modules to be compiled as C libraries, and allows cc modules to depend on these rust-generated modules. This also means that soong-rust should not have any dependencies on soong-cc aside from what's required for testing. There's a couple small fixes included as well: - A bug in libNameFromFilePath that caused issues when library's had "lib" in their name. - VariantName is removed from rust library MutatedProperties since this was unused. Bug: 140726209 Test: Soong tests pass. Test: Example cc_binary can include a rust shared library as a dep. Test: m crosvm.experimental Change-Id: Ia7deed1345d2423001089014cc65ce7934123da4
2019-10-18 23:49:46 +02:00
InRecovery() bool
OnlyInRecovery() bool
UseVndk() bool
MustUseVendorVariant() bool
IsVndk() bool
HasVendorVariant() bool
SdkVersion() string
ToolchainLibrary() bool
NdkPrebuiltStl() bool
StubDecorator() bool
Add a common interface for cc linkable libraries. Adds an interface, CcLinkableInterface, for cc linkable dependencies which come from other toolchains such as Rust. Bug: 140726209 Test: Soong tests pass, rust modules still compile. Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-18 23:18:45 +02:00
}
type DependencyTag struct {
blueprint.BaseDependencyTag
Name string
Library bool
Shared bool
ReexportFlags bool
ExplicitlyVersioned bool
shared_lib dependency from a static lib crosses the APEX boundary cc_library_static { name: "libfoo", shared_libs: ["libbar"], } cc_library { name: "libbar", } If libfoo is part of an APEX, then libbar is no longer considered as a member of the APEX, because it isn't actually linked to libfoo. To distinguish such a shared lib dependency from a static library from a shared lib dependency from a shared library, a new dep type SharedFromStaticDepTag is introduced. It is treated exactly the same as SharedDepTag, except when we determine whether a dependency is crossing the APEX boundary or not. This allows us to check the apex_available property more correctly. Previously, modules were incorrectly considered as being used for an APEX due to the shared lib dependency from a static lib. As a good side effect, this also reduces the number of APEX variants. Specifically, on aosp_arm64, the number of the generated modules were reduced from 44745 to 44180. Exempt-From-Owner-Approval: cherry-pick from internal Bug: 147671264 Test: m Merged-In: I899ccb9eae1574effef77ca1bc3a0df145983861 (cherry picked from commit 931b676a69c092451ed25a5dda67accf90ce6457) Change-Id: I899ccb9eae1574effef77ca1bc3a0df145983861
2020-01-16 09:14:23 +01:00
FromStatic bool
Add a common interface for cc linkable libraries. Adds an interface, CcLinkableInterface, for cc linkable dependencies which come from other toolchains such as Rust. Bug: 140726209 Test: Soong tests pass, rust modules still compile. Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-18 23:18:45 +02:00
}
var (
SharedDepTag = DependencyTag{Name: "shared", Library: true, Shared: true}
StaticDepTag = DependencyTag{Name: "static", Library: true}
shared_lib dependency from a static lib crosses the APEX boundary cc_library_static { name: "libfoo", shared_libs: ["libbar"], } cc_library { name: "libbar", } If libfoo is part of an APEX, then libbar is no longer considered as a member of the APEX, because it isn't actually linked to libfoo. To distinguish such a shared lib dependency from a static library from a shared lib dependency from a shared library, a new dep type SharedFromStaticDepTag is introduced. It is treated exactly the same as SharedDepTag, except when we determine whether a dependency is crossing the APEX boundary or not. This allows us to check the apex_available property more correctly. Previously, modules were incorrectly considered as being used for an APEX due to the shared lib dependency from a static lib. As a good side effect, this also reduces the number of APEX variants. Specifically, on aosp_arm64, the number of the generated modules were reduced from 44745 to 44180. Exempt-From-Owner-Approval: cherry-pick from internal Bug: 147671264 Test: m Merged-In: I899ccb9eae1574effef77ca1bc3a0df145983861 (cherry picked from commit 931b676a69c092451ed25a5dda67accf90ce6457) Change-Id: I899ccb9eae1574effef77ca1bc3a0df145983861
2020-01-16 09:14:23 +01:00
// Same as SharedDepTag, but from a static lib
SharedFromStaticDepTag = DependencyTag{Name: "shared from static", Library: true, Shared: true, FromStatic: true}
Add a common interface for cc linkable libraries. Adds an interface, CcLinkableInterface, for cc linkable dependencies which come from other toolchains such as Rust. Bug: 140726209 Test: Soong tests pass, rust modules still compile. Change-Id: I7378a46fad94fd0b735746aaf4e265fd2c2c04d8
2019-10-18 23:18:45 +02:00
CrtBeginDepTag = DependencyTag{Name: "crtbegin"}
CrtEndDepTag = DependencyTag{Name: "crtend"}
)
Reference in a new issue Copy permalink