StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose some factories for aidl_test.go"

Browse Source
This commit is contained in:
Treehugger Robot
2019-12-13 05:51:38 +00:00
committed by Gerrit Code Review
parent 90872f1c9c b90e491e2b
commit cf96a82fbd
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc.go
View File

@@ -38,7 +38,7 @@ func init() {
android.PreDepsMutators(func(ctx android.RegisterMutatorsContext) { android.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
ctx.BottomUp("vndk", VndkMutator).Parallel() ctx.BottomUp("vndk", VndkMutator).Parallel()
ctx.BottomUp("link", LinkageMutator).Parallel() ctx.BottomUp("link", LinkageMutator).Parallel()
ctx.BottomUp("ndk_api", ndkApiMutator).Parallel() ctx.BottomUp("ndk_api", NdkApiMutator).Parallel()
ctx.BottomUp("test_per_src", TestPerSrcMutator).Parallel() ctx.BottomUp("test_per_src", TestPerSrcMutator).Parallel()
ctx.BottomUp("version", VersionMutator).Parallel() ctx.BottomUp("version", VersionMutator).Parallel()
ctx.BottomUp("begin", BeginMutator).Parallel() ctx.BottomUp("begin", BeginMutator).Parallel()

4
cc/ndk_library.go
View File

@@ -228,7 +228,7 @@ func generateStubApiVariants(mctx android.BottomUpMutatorContext, c *stubDecorat
} }
} }
func ndkApiMutator(mctx android.BottomUpMutatorContext) { func NdkApiMutator(mctx android.BottomUpMutatorContext) {
if m, ok := mctx.Module().(*Module); ok { if m, ok := mctx.Module().(*Module); ok {
if m.Enabled() { if m.Enabled() {
if compiler, ok := m.compiler.(*stubDecorator); ok { if compiler, ok := m.compiler.(*stubDecorator); ok {
@@ -389,7 +389,7 @@ func newStubLibrary() *Module {
// ndk_library creates a stub library that exposes dummy implementation // ndk_library creates a stub library that exposes dummy implementation
// of functions and variables for use at build time only. // of functions and variables for use at build time only.
func ndkLibraryFactory() android.Module { func NdkLibraryFactory() android.Module {
module := newStubLibrary() module := newStubLibrary()
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibBoth) android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibBoth)
module.ModuleBase.EnableNativeBridgeSupportByDefault() module.ModuleBase.EnableNativeBridgeSupportByDefault()

8
cc/ndk_prebuilt.go
View File

@@ -23,8 +23,8 @@ import (
) )
func init() { func init() {
android.RegisterModuleType("ndk_prebuilt_object", ndkPrebuiltObjectFactory) android.RegisterModuleType("ndk_prebuilt_object", NdkPrebuiltObjectFactory)
android.RegisterModuleType("ndk_prebuilt_static_stl", ndkPrebuiltStaticStlFactory) android.RegisterModuleType("ndk_prebuilt_static_stl", NdkPrebuiltStaticStlFactory)
android.RegisterModuleType("ndk_prebuilt_shared_stl", NdkPrebuiltSharedStlFactory) android.RegisterModuleType("ndk_prebuilt_shared_stl", NdkPrebuiltSharedStlFactory)
} }
@@ -68,7 +68,7 @@ func (*ndkPrebuiltObjectLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
// operations. Soong's module name format is ndk_<NAME>.o.<sdk_version> where // operations. Soong's module name format is ndk_<NAME>.o.<sdk_version> where
// the object is located under // the object is located under
// ./prebuilts/ndk/current/platforms/android-<sdk_version>/arch-$(HOST_ARCH)/usr/lib/<NAME>.o. // ./prebuilts/ndk/current/platforms/android-<sdk_version>/arch-$(HOST_ARCH)/usr/lib/<NAME>.o.
func ndkPrebuiltObjectFactory() android.Module { func NdkPrebuiltObjectFactory() android.Module {
module := newBaseModule(android.DeviceSupported, android.MultilibBoth) module := newBaseModule(android.DeviceSupported, android.MultilibBoth)
module.ModuleBase.EnableNativeBridgeSupportByDefault() module.ModuleBase.EnableNativeBridgeSupportByDefault()
module.linker = &ndkPrebuiltObjectLinker{ module.linker = &ndkPrebuiltObjectLinker{
@@ -126,7 +126,7 @@ func NdkPrebuiltSharedStlFactory() android.Module {
// library (stl) library for linking operation. The soong's module name format // library (stl) library for linking operation. The soong's module name format
// is ndk_<NAME>.a where the library is located under // is ndk_<NAME>.a where the library is located under
// ./prebuilts/ndk/current/sources/cxx-stl/llvm-libc++/libs/$(HOST_ARCH)/<NAME>.a. // ./prebuilts/ndk/current/sources/cxx-stl/llvm-libc++/libs/$(HOST_ARCH)/<NAME>.a.
func ndkPrebuiltStaticStlFactory() android.Module { func NdkPrebuiltStaticStlFactory() android.Module {
module, library := NewLibrary(android.DeviceSupported) module, library := NewLibrary(android.DeviceSupported)
library.BuildOnlyStatic() library.BuildOnlyStatic()
module.compiler = nil module.compiler = nil

2
cc/ndk_sysroot.go
View File

@@ -58,7 +58,7 @@ import (
func init() { func init() {
android.RegisterModuleType("ndk_headers", ndkHeadersFactory) android.RegisterModuleType("ndk_headers", ndkHeadersFactory)
android.RegisterModuleType("ndk_library", ndkLibraryFactory) android.RegisterModuleType("ndk_library", NdkLibraryFactory)
android.RegisterModuleType("versioned_ndk_headers", versionedNdkHeadersFactory) android.RegisterModuleType("versioned_ndk_headers", versionedNdkHeadersFactory)
android.RegisterModuleType("preprocessed_ndk_headers", preprocessedNdkHeadersFactory) android.RegisterModuleType("preprocessed_ndk_headers", preprocessedNdkHeadersFactory)
android.RegisterSingletonType("ndk", NdkSingleton) android.RegisterSingletonType("ndk", NdkSingleton)

1
cc/testing.go
View File

@@ -265,6 +265,7 @@ func CreateTestContext(bp string, fs map[string][]byte,
ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory) ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)
ctx.RegisterModuleType("llndk_library", LlndkLibraryFactory) ctx.RegisterModuleType("llndk_library", LlndkLibraryFactory)
ctx.RegisterModuleType("llndk_headers", llndkHeadersFactory) ctx.RegisterModuleType("llndk_headers", llndkHeadersFactory)
ctx.RegisterModuleType("ndk_library", NdkLibraryFactory)
ctx.RegisterModuleType("vendor_public_library", vendorPublicLibraryFactory) ctx.RegisterModuleType("vendor_public_library", vendorPublicLibraryFactory)
ctx.RegisterModuleType("cc_object", ObjectFactory) ctx.RegisterModuleType("cc_object", ObjectFactory)
ctx.RegisterModuleType("filegroup", android.FileGroupFactory) ctx.RegisterModuleType("filegroup", android.FileGroupFactory)