tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

LLNDK can re-export headers

Browse source 
am: 2a45412445

Change-Id: I15dbe8697786ce257f6ff177ea6d4aa2ca2c262c
This commit is contained in:
Jiyong Park 2017-10-25 03:07:04 +00:00 committed by android-build-merger
commit 939658c4a8
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cc/cc.go
View file

@ -1402,6 +1402,9 @@ func vendorMutator(mctx android.BottomUpMutatorContext) {
// LL-NDK stubs only exist in the vendor variant, since the // LL-NDK stubs only exist in the vendor variant, since the
// real libraries will be used in the core variant. // real libraries will be used in the core variant.
mctx.CreateVariations(vendorMode) mctx.CreateVariations(vendorMode)
} else if _, ok := m.linker.(*llndkHeadersDecorator); ok {
// ... and LL-NDK headers as well
mctx.CreateVariations(vendorMode)
} else if m.hasVendorVariant() { } else if m.hasVendorVariant() {
// This will be available in both /system and /vendor // This will be available in both /system and /vendor
// or a /system directory that is available to vendor. // or a /system directory that is available to vendor.

38
cc/llndk_library.go
View file

@ -23,6 +23,7 @@ import (
var ( var (
llndkLibrarySuffix = ".llndk" llndkLibrarySuffix = ".llndk"
llndkHeadersSuffix = ".llndk"
) )
// Creates a stub shared library based on the provided version file. // Creates a stub shared library based on the provided version file.
@ -55,6 +56,9 @@ type llndkLibraryProperties struct {
// When set to false, this module can only be depended on by VNDK libraries, not vendor // When set to false, this module can only be depended on by VNDK libraries, not vendor
// libraries. This effectively hides this module from vendors. Default value is true. // libraries. This effectively hides this module from vendors. Default value is true.
Vendor_available bool Vendor_available bool
// list of llndk headers to re-export include directories from.
Export_llndk_headers []string `android:"arch_variant"`
} }
type llndkStubDecorator struct { type llndkStubDecorator struct {
@ -78,7 +82,10 @@ func (stub *llndkStubDecorator) compile(ctx ModuleContext, flags Flags, deps Pat
} }
func (stub *llndkStubDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps { func (stub *llndkStubDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
return Deps{} headers := addSuffix(stub.Properties.Export_llndk_headers, llndkHeadersSuffix)
deps.HeaderLibs = append(deps.HeaderLibs, headers...)
deps.ReexportHeaderLibHeaders = append(deps.ReexportHeaderLibHeaders, headers...)
return deps
} }
func (stub *llndkStubDecorator) Name(name string) string { func (stub *llndkStubDecorator) Name(name string) string {
@ -173,6 +180,35 @@ func llndkLibraryFactory() android.Module {
return module return module
} }
type llndkHeadersDecorator struct {
*libraryDecorator
}
func (headers *llndkHeadersDecorator) Name(name string) string {
return name + llndkHeadersSuffix
}
func llndkHeadersFactory() android.Module {
module, library := NewLibrary(android.DeviceSupported)
library.HeaderOnly()
library.setStatic()
decorator := &llndkHeadersDecorator{
libraryDecorator: library,
}
module.compiler = nil
module.linker = decorator
module.installer = nil
module.AddProperties(&library.MutatedProperties, &library.flagExporter.Properties)
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibBoth)
return module
}
func init() { func init() {
android.RegisterModuleType("llndk_library", llndkLibraryFactory) android.RegisterModuleType("llndk_library", llndkLibraryFactory)
android.RegisterModuleType("llndk_headers", llndkHeadersFactory)
} }