2015-03-18 21:28:46 +01:00
|
|
|
// Copyright 2015 Google Inc. All rights reserved.
|
2015-01-31 02:27:36 +01:00
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package cc
|
|
|
|
|
|
|
|
// This file contains the module types for compiling C/C++ for Android, and converts the properties
|
|
|
|
// into the flags and filenames necessary to pass to the compiler. The final creation of the rules
|
|
|
|
// is handled in builder.go
|
|
|
|
|
|
|
|
import (
|
2016-08-03 23:12:14 +02:00
|
|
|
"strconv"
|
2015-01-31 02:27:36 +01:00
|
|
|
"strings"
|
|
|
|
|
2015-03-24 01:50:24 +01:00
|
|
|
"github.com/google/blueprint"
|
2015-10-29 01:23:31 +01:00
|
|
|
"github.com/google/blueprint/proptools"
|
2015-03-24 01:50:24 +01:00
|
|
|
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/soong/android"
|
2016-07-29 22:44:28 +02:00
|
|
|
"android/soong/cc/config"
|
2015-03-18 21:28:46 +01:00
|
|
|
"android/soong/genrule"
|
2015-01-31 02:27:36 +01:00
|
|
|
)
|
|
|
|
|
2015-06-17 23:20:06 +02:00
|
|
|
func init() {
|
2016-10-12 23:28:16 +02:00
|
|
|
android.RegisterModuleType("cc_defaults", defaultsFactory)
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2016-10-12 23:38:15 +02:00
|
|
|
android.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
2018-01-31 16:54:12 +01:00
|
|
|
ctx.BottomUp("image", imageMutator).Parallel()
|
2016-10-12 23:38:15 +02:00
|
|
|
ctx.BottomUp("link", linkageMutator).Parallel()
|
2017-08-03 14:22:50 +02:00
|
|
|
ctx.BottomUp("vndk", vndkMutator).Parallel()
|
2016-10-12 23:38:15 +02:00
|
|
|
ctx.BottomUp("ndk_api", ndkApiMutator).Parallel()
|
|
|
|
ctx.BottomUp("test_per_src", testPerSrcMutator).Parallel()
|
|
|
|
ctx.BottomUp("begin", beginMutator).Parallel()
|
|
|
|
})
|
2016-01-06 23:41:07 +01:00
|
|
|
|
2016-10-12 23:38:15 +02:00
|
|
|
android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
|
|
|
ctx.TopDown("asan_deps", sanitizerDepsMutator(asan))
|
|
|
|
ctx.BottomUp("asan", sanitizerMutator(asan)).Parallel()
|
2016-01-06 23:41:07 +01:00
|
|
|
|
2017-11-01 10:20:21 +01:00
|
|
|
ctx.TopDown("cfi_deps", sanitizerDepsMutator(cfi))
|
|
|
|
ctx.BottomUp("cfi", sanitizerMutator(cfi)).Parallel()
|
|
|
|
|
2016-10-12 23:38:15 +02:00
|
|
|
ctx.TopDown("tsan_deps", sanitizerDepsMutator(tsan))
|
|
|
|
ctx.BottomUp("tsan", sanitizerMutator(tsan)).Parallel()
|
2017-02-10 01:16:31 +01:00
|
|
|
|
2018-03-13 18:41:07 +01:00
|
|
|
ctx.TopDown("sanitize_runtime_deps", sanitizerRuntimeDepsMutator())
|
2018-02-22 00:49:20 +01:00
|
|
|
|
2018-04-24 00:44:39 +02:00
|
|
|
ctx.BottomUp("coverage", coverageLinkingMutator).Parallel()
|
2017-02-08 22:45:53 +01:00
|
|
|
ctx.TopDown("vndk_deps", sabiDepsMutator)
|
2017-05-10 00:44:35 +02:00
|
|
|
|
|
|
|
ctx.TopDown("lto_deps", ltoDepsMutator)
|
|
|
|
ctx.BottomUp("lto", ltoMutator).Parallel()
|
2016-10-12 23:38:15 +02:00
|
|
|
})
|
2016-07-29 22:44:28 +02:00
|
|
|
|
|
|
|
pctx.Import("android/soong/cc/config")
|
2015-06-17 23:20:06 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
type Deps struct {
|
|
|
|
SharedLibs, LateSharedLibs []string
|
|
|
|
StaticLibs, LateStaticLibs, WholeStaticLibs []string
|
2016-12-13 21:50:57 +01:00
|
|
|
HeaderLibs []string
|
2017-12-19 18:17:32 +01:00
|
|
|
RuntimeLibs []string
|
2015-09-24 00:26:20 +02:00
|
|
|
|
2016-12-13 21:50:57 +01:00
|
|
|
ReexportSharedLibHeaders, ReexportStaticLibHeaders, ReexportHeaderLibHeaders []string
|
2016-06-07 03:22:19 +02:00
|
|
|
|
2016-04-11 23:37:39 +02:00
|
|
|
ObjFiles []string
|
2015-03-17 23:06:21 +01:00
|
|
|
|
2016-04-20 23:21:14 +02:00
|
|
|
GeneratedSources []string
|
|
|
|
GeneratedHeaders []string
|
|
|
|
|
2016-09-29 02:34:58 +02:00
|
|
|
ReexportGeneratedHeaders []string
|
|
|
|
|
2015-03-24 01:50:24 +01:00
|
|
|
CrtBegin, CrtEnd string
|
2017-09-19 08:19:12 +02:00
|
|
|
LinkerScript string
|
2015-03-17 23:06:21 +01:00
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
type PathDeps struct {
|
2016-10-01 02:10:16 +02:00
|
|
|
// Paths to .so files
|
|
|
|
SharedLibs, LateSharedLibs android.Paths
|
|
|
|
// Paths to the dependencies to use for .so files (.so.toc files)
|
|
|
|
SharedLibsDeps, LateSharedLibsDeps android.Paths
|
|
|
|
// Paths to .a files
|
2016-05-19 00:37:25 +02:00
|
|
|
StaticLibs, LateStaticLibs, WholeStaticLibs android.Paths
|
2015-09-24 00:26:20 +02:00
|
|
|
|
2016-10-01 02:10:16 +02:00
|
|
|
// Paths to .o files
|
2016-09-27 02:33:01 +02:00
|
|
|
Objs Objects
|
2017-02-10 01:16:31 +01:00
|
|
|
StaticLibObjs Objects
|
2016-09-27 02:33:01 +02:00
|
|
|
WholeStaticLibObjs Objects
|
2015-09-24 00:26:20 +02:00
|
|
|
|
2016-10-01 02:10:16 +02:00
|
|
|
// Paths to generated source files
|
2016-05-19 00:37:25 +02:00
|
|
|
GeneratedSources android.Paths
|
|
|
|
GeneratedHeaders android.Paths
|
2016-04-20 23:21:14 +02:00
|
|
|
|
2016-07-09 09:14:08 +02:00
|
|
|
Flags, ReexportedFlags []string
|
2016-09-29 21:13:36 +02:00
|
|
|
ReexportedFlagsDeps android.Paths
|
2015-09-24 00:26:20 +02:00
|
|
|
|
2016-10-01 02:10:16 +02:00
|
|
|
// Paths to crt*.o files
|
2016-05-19 00:37:25 +02:00
|
|
|
CrtBegin, CrtEnd android.OptionalPath
|
2017-09-19 08:19:12 +02:00
|
|
|
LinkerScript android.OptionalPath
|
2015-09-24 00:26:20 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
type Flags struct {
|
2017-06-15 23:45:18 +02:00
|
|
|
GlobalFlags []string // Flags that apply to C, C++, and assembly source files
|
|
|
|
ArFlags []string // Flags that apply to ar
|
|
|
|
AsFlags []string // Flags that apply to assembly source files
|
|
|
|
CFlags []string // Flags that apply to C and C++ source files
|
|
|
|
ToolingCFlags []string // Flags that apply to C and C++ source files parsed by clang LibTooling tools
|
|
|
|
ConlyFlags []string // Flags that apply to C source files
|
|
|
|
CppFlags []string // Flags that apply to C++ source files
|
|
|
|
ToolingCppFlags []string // Flags that apply to C++ source files parsed by clang LibTooling tools
|
|
|
|
YaccFlags []string // Flags that apply to Yacc source files
|
|
|
|
protoFlags []string // Flags that apply to proto source files
|
2017-11-19 03:23:14 +01:00
|
|
|
protoOutParams []string // Flags that modify the output of proto generated files
|
2017-06-15 23:45:18 +02:00
|
|
|
aidlFlags []string // Flags that apply to aidl source files
|
|
|
|
rsFlags []string // Flags that apply to renderscript source files
|
|
|
|
LdFlags []string // Flags that apply to linker command lines
|
|
|
|
libFlags []string // Flags to add libraries early to the link order
|
|
|
|
TidyFlags []string // Flags that apply to clang-tidy
|
|
|
|
SAbiFlags []string // Flags that apply to header-abi-dumper
|
|
|
|
YasmFlags []string // Flags that apply to yasm assembly source files
|
2015-04-22 22:07:53 +02:00
|
|
|
|
2017-03-31 00:03:04 +02:00
|
|
|
// Global include flags that apply to C, C++, and assembly source files
|
|
|
|
// These must be after any module include flags, which will be in GlobalFlags.
|
|
|
|
SystemIncludeFlags []string
|
|
|
|
|
2016-07-29 22:44:28 +02:00
|
|
|
Toolchain config.Toolchain
|
2015-04-22 22:07:53 +02:00
|
|
|
Clang bool
|
2016-09-27 00:45:04 +02:00
|
|
|
Tidy bool
|
2017-02-10 01:16:31 +01:00
|
|
|
Coverage bool
|
2017-02-08 22:45:53 +01:00
|
|
|
SAbiDump bool
|
2018-02-14 22:58:34 +01:00
|
|
|
ProtoRoot bool
|
2016-01-04 23:34:37 +01:00
|
|
|
|
|
|
|
RequiredInstructionSet string
|
2016-01-06 23:41:07 +01:00
|
|
|
DynamicLinker string
|
|
|
|
|
2017-09-01 08:38:27 +02:00
|
|
|
CFlagsDeps android.Paths // Files depended on by compiler flags
|
|
|
|
LdFlagsDeps android.Paths // Files depended on by linker flags
|
2016-12-01 23:45:23 +01:00
|
|
|
|
|
|
|
GroupStaticLibs bool
|
2018-02-09 03:32:11 +01:00
|
|
|
ArGoldPlugin bool // Whether LLVM gold plugin option is passed to llvm-ar
|
2015-03-17 23:06:21 +01:00
|
|
|
}
|
|
|
|
|
2016-04-11 23:37:39 +02:00
|
|
|
type ObjectLinkerProperties struct {
|
|
|
|
// names of other cc_object modules to link into this module using partial linking
|
|
|
|
Objs []string `android:"arch_variant"`
|
2017-09-19 07:47:20 +02:00
|
|
|
|
|
|
|
// if set, add an extra objcopy --prefix-symbols= step
|
2017-11-07 19:57:05 +01:00
|
|
|
Prefix_symbols *string
|
2016-04-11 23:37:39 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
// Properties used to compile all C or C++ modules
|
|
|
|
type BaseProperties struct {
|
|
|
|
// compile module with clang instead of gcc
|
|
|
|
Clang *bool `android:"arch_variant"`
|
2015-04-25 02:31:52 +02:00
|
|
|
|
2015-05-11 22:39:40 +02:00
|
|
|
// Minimum sdk version supported when compiling against the ndk
|
2017-11-07 19:57:05 +01:00
|
|
|
Sdk_version *string
|
2015-04-25 02:31:52 +02:00
|
|
|
|
2017-12-19 18:17:32 +01:00
|
|
|
AndroidMkSharedLibs []string `blueprint:"mutated"`
|
|
|
|
AndroidMkRuntimeLibs []string `blueprint:"mutated"`
|
|
|
|
HideFromMake bool `blueprint:"mutated"`
|
|
|
|
PreventInstall bool `blueprint:"mutated"`
|
2017-09-14 03:37:08 +02:00
|
|
|
|
|
|
|
UseVndk bool `blueprint:"mutated"`
|
2017-12-08 00:28:59 +01:00
|
|
|
|
|
|
|
// *.logtags files, to combine together in order to generate the /system/etc/event-log-tags
|
|
|
|
// file
|
|
|
|
Logtags []string
|
2018-01-31 16:54:12 +01:00
|
|
|
|
|
|
|
// Make this module available when building for recovery
|
|
|
|
Recovery_available *bool
|
|
|
|
|
|
|
|
InRecovery bool `blueprint:"mutated"`
|
2017-09-14 03:37:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
type VendorProperties struct {
|
2017-08-16 07:05:54 +02:00
|
|
|
// whether this module should be allowed to be directly depended by other
|
|
|
|
// modules with `vendor: true`, `proprietary: true`, or `vendor_available:true`.
|
|
|
|
// If set to true, two variants will be built separately, one like
|
|
|
|
// normal, and the other limited to the set of libraries and headers
|
|
|
|
// that are exposed to /vendor modules.
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
//
|
|
|
|
// The vendor variant may be used with a different (newer) /system,
|
|
|
|
// so it shouldn't have any unversioned runtime dependencies, or
|
|
|
|
// make assumptions about the system that may not be true in the
|
|
|
|
// future.
|
|
|
|
//
|
2017-08-16 07:05:54 +02:00
|
|
|
// If set to false, this module becomes inaccessible from /vendor modules.
|
|
|
|
//
|
|
|
|
// Default value is true when vndk: {enabled: true} or vendor: true.
|
|
|
|
//
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
// Nothing happens if BOARD_VNDK_VERSION isn't set in the BoardConfig.mk
|
|
|
|
Vendor_available *bool
|
2018-04-09 05:03:06 +02:00
|
|
|
|
|
|
|
// whether this module is capable of being loaded with other instance
|
|
|
|
// (possibly an older version) of the same module in the same process.
|
|
|
|
// Currently, a shared library that is a member of VNDK (vndk: {enabled: true})
|
|
|
|
// can be double loaded in a vendor process if the library is also a
|
|
|
|
// (direct and indirect) dependency of an LLNDK library. Such libraries must be
|
|
|
|
// explicitly marked as `double_loadable: true` by the owner, or the dependency
|
|
|
|
// from the LLNDK lib should be cut if the lib is not designed to be double loaded.
|
|
|
|
Double_loadable *bool
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type ModuleContextIntf interface {
|
|
|
|
static() bool
|
|
|
|
staticBinary() bool
|
|
|
|
clang() bool
|
2016-07-29 22:44:28 +02:00
|
|
|
toolchain() config.Toolchain
|
2017-09-28 02:01:44 +02:00
|
|
|
useSdk() bool
|
2016-01-04 23:34:37 +01:00
|
|
|
sdkVersion() string
|
2017-09-28 02:01:44 +02:00
|
|
|
useVndk() bool
|
2017-06-23 12:24:43 +02:00
|
|
|
isVndk() bool
|
|
|
|
isVndkSp() bool
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
isVndkExt() bool
|
2018-01-31 16:54:12 +01:00
|
|
|
inRecovery() bool
|
2017-02-08 22:45:53 +01:00
|
|
|
createVndkSourceAbiDump() bool
|
2016-03-31 06:00:30 +02:00
|
|
|
selectedStl() string
|
2016-10-07 01:12:58 +02:00
|
|
|
baseModuleName() string
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
getVndkExtendsModuleName() string
|
2018-02-14 11:16:12 +01:00
|
|
|
isPgoCompile() bool
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type ModuleContext interface {
|
2016-05-19 00:37:25 +02:00
|
|
|
android.ModuleContext
|
2016-01-04 23:34:37 +01:00
|
|
|
ModuleContextIntf
|
|
|
|
}
|
|
|
|
|
|
|
|
type BaseModuleContext interface {
|
2016-05-19 00:37:25 +02:00
|
|
|
android.BaseContext
|
2016-01-04 23:34:37 +01:00
|
|
|
ModuleContextIntf
|
|
|
|
}
|
|
|
|
|
2016-12-14 02:06:13 +01:00
|
|
|
type DepsContext interface {
|
|
|
|
android.BottomUpMutatorContext
|
|
|
|
ModuleContextIntf
|
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
type feature interface {
|
|
|
|
begin(ctx BaseModuleContext)
|
2016-12-14 02:06:13 +01:00
|
|
|
deps(ctx DepsContext, deps Deps) Deps
|
2016-01-04 23:34:37 +01:00
|
|
|
flags(ctx ModuleContext, flags Flags) Flags
|
|
|
|
props() []interface{}
|
|
|
|
}
|
|
|
|
|
|
|
|
type compiler interface {
|
2016-08-01 22:20:05 +02:00
|
|
|
compilerInit(ctx BaseModuleContext)
|
2016-12-14 02:06:13 +01:00
|
|
|
compilerDeps(ctx DepsContext, deps Deps) Deps
|
2017-11-16 23:33:08 +01:00
|
|
|
compilerFlags(ctx ModuleContext, flags Flags, deps PathDeps) Flags
|
2016-08-01 22:20:05 +02:00
|
|
|
compilerProps() []interface{}
|
|
|
|
|
2016-07-27 19:31:13 +02:00
|
|
|
appendCflags([]string)
|
|
|
|
appendAsflags([]string)
|
2016-09-27 02:33:01 +02:00
|
|
|
compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type linker interface {
|
2016-08-01 22:20:05 +02:00
|
|
|
linkerInit(ctx BaseModuleContext)
|
2016-12-14 02:06:13 +01:00
|
|
|
linkerDeps(ctx DepsContext, deps Deps) Deps
|
2016-08-01 22:20:05 +02:00
|
|
|
linkerFlags(ctx ModuleContext, flags Flags) Flags
|
|
|
|
linkerProps() []interface{}
|
|
|
|
|
2016-09-27 02:33:01 +02:00
|
|
|
link(ctx ModuleContext, flags Flags, deps PathDeps, objs Objects) android.Path
|
2016-07-27 19:31:13 +02:00
|
|
|
appendLdflags([]string)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type installer interface {
|
2016-08-01 22:20:05 +02:00
|
|
|
installerProps() []interface{}
|
2016-05-19 00:37:25 +02:00
|
|
|
install(ctx ModuleContext, path android.Path)
|
2016-01-04 23:34:37 +01:00
|
|
|
inData() bool
|
2017-03-30 07:00:18 +02:00
|
|
|
inSanitizerDir() bool
|
2016-09-29 01:18:03 +02:00
|
|
|
hostToolPath() android.OptionalPath
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
2016-04-12 00:06:20 +02:00
|
|
|
type dependencyTag struct {
|
|
|
|
blueprint.BaseDependencyTag
|
|
|
|
name string
|
|
|
|
library bool
|
2016-06-07 03:22:19 +02:00
|
|
|
|
|
|
|
reexportFlags bool
|
2016-04-12 00:06:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
var (
|
2016-09-29 02:34:58 +02:00
|
|
|
sharedDepTag = dependencyTag{name: "shared", library: true}
|
|
|
|
sharedExportDepTag = dependencyTag{name: "shared", library: true, reexportFlags: true}
|
|
|
|
lateSharedDepTag = dependencyTag{name: "late shared", library: true}
|
|
|
|
staticDepTag = dependencyTag{name: "static", library: true}
|
|
|
|
staticExportDepTag = dependencyTag{name: "static", library: true, reexportFlags: true}
|
|
|
|
lateStaticDepTag = dependencyTag{name: "late static", library: true}
|
|
|
|
wholeStaticDepTag = dependencyTag{name: "whole static", library: true, reexportFlags: true}
|
2016-12-15 16:39:51 +01:00
|
|
|
headerDepTag = dependencyTag{name: "header", library: true}
|
|
|
|
headerExportDepTag = dependencyTag{name: "header", library: true, reexportFlags: true}
|
2016-09-29 02:34:58 +02:00
|
|
|
genSourceDepTag = dependencyTag{name: "gen source"}
|
|
|
|
genHeaderDepTag = dependencyTag{name: "gen header"}
|
|
|
|
genHeaderExportDepTag = dependencyTag{name: "gen header", reexportFlags: true}
|
|
|
|
objDepTag = dependencyTag{name: "obj"}
|
|
|
|
crtBeginDepTag = dependencyTag{name: "crtbegin"}
|
|
|
|
crtEndDepTag = dependencyTag{name: "crtend"}
|
2017-09-19 08:19:12 +02:00
|
|
|
linkerScriptDepTag = dependencyTag{name: "linker script"}
|
2016-09-29 02:34:58 +02:00
|
|
|
reuseObjTag = dependencyTag{name: "reuse objects"}
|
|
|
|
ndkStubDepTag = dependencyTag{name: "ndk stub", library: true}
|
|
|
|
ndkLateStubDepTag = dependencyTag{name: "ndk late stub", library: true}
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndkExtDepTag = dependencyTag{name: "vndk extends", library: true}
|
2017-12-19 18:17:32 +01:00
|
|
|
runtimeDepTag = dependencyTag{name: "runtime lib"}
|
2016-04-12 00:06:20 +02:00
|
|
|
)
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
// Module contains the properties and members used by all C/C++ module types, and implements
|
|
|
|
// the blueprint.Module interface. It delegates to compiler, linker, and installer interfaces
|
|
|
|
// to construct the output file. Behavior can be customized with a Customizer interface
|
|
|
|
type Module struct {
|
2016-05-19 00:37:25 +02:00
|
|
|
android.ModuleBase
|
2017-07-07 23:33:33 +02:00
|
|
|
android.DefaultableModuleBase
|
2015-04-25 02:31:52 +02:00
|
|
|
|
2017-09-14 03:37:08 +02:00
|
|
|
Properties BaseProperties
|
|
|
|
VendorProperties VendorProperties
|
2016-01-04 23:34:37 +01:00
|
|
|
|
|
|
|
// initialize before calling Init
|
2016-05-19 00:37:25 +02:00
|
|
|
hod android.HostOrDeviceSupported
|
|
|
|
multilib android.Multilib
|
2015-04-25 02:31:52 +02:00
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
// delegates, initialize before calling Init
|
2016-09-13 22:41:39 +02:00
|
|
|
features []feature
|
|
|
|
compiler compiler
|
|
|
|
linker linker
|
|
|
|
installer installer
|
|
|
|
stl *stl
|
|
|
|
sanitize *sanitize
|
2017-02-10 01:16:31 +01:00
|
|
|
coverage *coverage
|
2017-02-08 22:45:53 +01:00
|
|
|
sabi *sabi
|
2017-06-23 12:24:43 +02:00
|
|
|
vndkdep *vndkdep
|
2017-05-10 00:44:35 +02:00
|
|
|
lto *lto
|
2017-09-01 08:38:27 +02:00
|
|
|
pgo *pgo
|
2016-01-06 23:41:07 +01:00
|
|
|
|
|
|
|
androidMkSharedLibDeps []string
|
2015-03-17 23:06:21 +01:00
|
|
|
|
2016-05-19 00:37:25 +02:00
|
|
|
outputFile android.OptionalPath
|
2015-04-28 22:30:13 +02:00
|
|
|
|
2016-07-29 22:44:28 +02:00
|
|
|
cachedToolchain config.Toolchain
|
2016-07-30 02:28:03 +02:00
|
|
|
|
|
|
|
subAndroidMkOnce map[subAndroidMkProvider]bool
|
2017-01-11 01:21:22 +01:00
|
|
|
|
|
|
|
// Flags used to compile this module
|
|
|
|
flags Flags
|
2017-09-28 02:05:30 +02:00
|
|
|
|
|
|
|
// When calling a linker, if module A depends on module B, then A must precede B in its command
|
2017-11-28 00:48:57 +01:00
|
|
|
// line invocation. depsInLinkOrder stores the proper ordering of all of the transitive
|
2017-09-28 02:05:30 +02:00
|
|
|
// deps of this module
|
2017-11-28 00:48:57 +01:00
|
|
|
depsInLinkOrder android.Paths
|
|
|
|
|
|
|
|
// only non-nil when this is a shared library that reuses the objects of a static library
|
|
|
|
staticVariant *Module
|
2015-03-17 23:06:21 +01:00
|
|
|
}
|
|
|
|
|
2017-06-24 00:06:31 +02:00
|
|
|
func (c *Module) Init() android.Module {
|
2018-05-09 22:45:03 +02:00
|
|
|
c.AddProperties(&c.Properties, &c.VendorProperties)
|
2016-01-04 23:34:37 +01:00
|
|
|
if c.compiler != nil {
|
2017-06-24 00:06:31 +02:00
|
|
|
c.AddProperties(c.compiler.compilerProps()...)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
if c.linker != nil {
|
2017-06-24 00:06:31 +02:00
|
|
|
c.AddProperties(c.linker.linkerProps()...)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
if c.installer != nil {
|
2017-06-24 00:06:31 +02:00
|
|
|
c.AddProperties(c.installer.installerProps()...)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2016-04-05 00:07:06 +02:00
|
|
|
if c.stl != nil {
|
2017-06-24 00:06:31 +02:00
|
|
|
c.AddProperties(c.stl.props()...)
|
2016-04-05 00:07:06 +02:00
|
|
|
}
|
2016-01-06 23:41:07 +01:00
|
|
|
if c.sanitize != nil {
|
2017-06-24 00:06:31 +02:00
|
|
|
c.AddProperties(c.sanitize.props()...)
|
2016-01-06 23:41:07 +01:00
|
|
|
}
|
2017-02-10 01:16:31 +01:00
|
|
|
if c.coverage != nil {
|
2017-06-24 00:06:31 +02:00
|
|
|
c.AddProperties(c.coverage.props()...)
|
2017-02-10 01:16:31 +01:00
|
|
|
}
|
2017-02-08 22:45:53 +01:00
|
|
|
if c.sabi != nil {
|
2017-06-24 00:06:31 +02:00
|
|
|
c.AddProperties(c.sabi.props()...)
|
2017-02-08 22:45:53 +01:00
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
if c.vndkdep != nil {
|
|
|
|
c.AddProperties(c.vndkdep.props()...)
|
|
|
|
}
|
2017-05-10 00:44:35 +02:00
|
|
|
if c.lto != nil {
|
|
|
|
c.AddProperties(c.lto.props()...)
|
|
|
|
}
|
2017-09-01 08:38:27 +02:00
|
|
|
if c.pgo != nil {
|
|
|
|
c.AddProperties(c.pgo.props()...)
|
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
for _, feature := range c.features {
|
2017-06-24 00:06:31 +02:00
|
|
|
c.AddProperties(feature.props()...)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2015-03-17 23:06:21 +01:00
|
|
|
|
2017-06-24 00:06:31 +02:00
|
|
|
android.InitAndroidArchModule(c, c.hod, c.multilib)
|
2015-03-17 23:06:21 +01:00
|
|
|
|
2017-07-07 23:33:33 +02:00
|
|
|
android.InitDefaultableModule(c)
|
2017-06-24 00:06:31 +02:00
|
|
|
|
|
|
|
return c
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2015-03-17 23:06:21 +01:00
|
|
|
|
2016-07-30 02:28:03 +02:00
|
|
|
// Returns true for dependency roots (binaries)
|
|
|
|
// TODO(ccross): also handle dlopenable libraries
|
|
|
|
func (c *Module) isDependencyRoot() bool {
|
|
|
|
if root, ok := c.linker.(interface {
|
|
|
|
isDependencyRoot() bool
|
|
|
|
}); ok {
|
|
|
|
return root.isDependencyRoot()
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
func (c *Module) useVndk() bool {
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
return c.Properties.UseVndk
|
|
|
|
}
|
|
|
|
|
2017-06-23 12:24:43 +02:00
|
|
|
func (c *Module) isVndk() bool {
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
if vndkdep := c.vndkdep; vndkdep != nil {
|
|
|
|
return vndkdep.isVndk()
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2018-02-14 11:16:12 +01:00
|
|
|
func (c *Module) isPgoCompile() bool {
|
|
|
|
if pgo := c.pgo; pgo != nil {
|
|
|
|
return pgo.Properties.PgoCompile
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
func (c *Module) isVndkSp() bool {
|
|
|
|
if vndkdep := c.vndkdep; vndkdep != nil {
|
|
|
|
return vndkdep.isVndkSp()
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Module) isVndkExt() bool {
|
|
|
|
if vndkdep := c.vndkdep; vndkdep != nil {
|
|
|
|
return vndkdep.isVndkExt()
|
2017-06-23 12:24:43 +02:00
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
func (c *Module) getVndkExtendsModuleName() string {
|
|
|
|
if vndkdep := c.vndkdep; vndkdep != nil {
|
|
|
|
return vndkdep.getVndkExtendsModuleName()
|
|
|
|
}
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2017-08-16 07:05:54 +02:00
|
|
|
// Returns true only when this module is configured to have core and vendor
|
|
|
|
// variants.
|
|
|
|
func (c *Module) hasVendorVariant() bool {
|
|
|
|
return c.isVndk() || Bool(c.VendorProperties.Vendor_available)
|
|
|
|
}
|
|
|
|
|
2018-01-31 16:54:12 +01:00
|
|
|
func (c *Module) inRecovery() bool {
|
|
|
|
return c.Properties.InRecovery || c.ModuleBase.InstallInRecovery()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Module) onlyInRecovery() bool {
|
|
|
|
return c.ModuleBase.InstallInRecovery()
|
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
type baseModuleContext struct {
|
2016-05-19 00:37:25 +02:00
|
|
|
android.BaseContext
|
2016-01-04 23:34:37 +01:00
|
|
|
moduleContextImpl
|
|
|
|
}
|
2015-11-03 01:43:11 +01:00
|
|
|
|
2016-12-14 02:06:13 +01:00
|
|
|
type depsContext struct {
|
|
|
|
android.BottomUpMutatorContext
|
|
|
|
moduleContextImpl
|
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
type moduleContext struct {
|
2016-05-19 00:37:25 +02:00
|
|
|
android.ModuleContext
|
2016-01-04 23:34:37 +01:00
|
|
|
moduleContextImpl
|
2015-03-17 23:06:21 +01:00
|
|
|
}
|
|
|
|
|
2017-11-08 08:03:48 +01:00
|
|
|
func (ctx *moduleContext) SocSpecific() bool {
|
|
|
|
return ctx.ModuleContext.SocSpecific() ||
|
|
|
|
(ctx.mod.hasVendorVariant() && ctx.mod.useVndk() && !ctx.mod.isVndk())
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
type moduleContextImpl struct {
|
|
|
|
mod *Module
|
|
|
|
ctx BaseModuleContext
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ctx *moduleContextImpl) clang() bool {
|
|
|
|
return ctx.mod.clang(ctx.ctx)
|
|
|
|
}
|
|
|
|
|
2016-07-29 22:44:28 +02:00
|
|
|
func (ctx *moduleContextImpl) toolchain() config.Toolchain {
|
2016-01-04 23:34:37 +01:00
|
|
|
return ctx.mod.toolchain(ctx.ctx)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ctx *moduleContextImpl) static() bool {
|
2017-11-01 10:20:21 +01:00
|
|
|
return ctx.mod.static()
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
func (ctx *moduleContextImpl) staticBinary() bool {
|
2016-07-30 02:28:03 +02:00
|
|
|
if static, ok := ctx.mod.linker.(interface {
|
|
|
|
staticBinary() bool
|
|
|
|
}); ok {
|
|
|
|
return static.staticBinary()
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2016-07-30 02:28:03 +02:00
|
|
|
return false
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
func (ctx *moduleContextImpl) useSdk() bool {
|
2018-01-31 16:54:12 +01:00
|
|
|
if ctx.ctx.Device() && !ctx.useVndk() && !ctx.inRecovery() {
|
2017-11-07 19:57:05 +01:00
|
|
|
return String(ctx.mod.Properties.Sdk_version) != ""
|
2016-06-07 21:34:45 +02:00
|
|
|
}
|
|
|
|
return false
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func (ctx *moduleContextImpl) sdkVersion() string {
|
2016-06-07 21:34:45 +02:00
|
|
|
if ctx.ctx.Device() {
|
2017-09-28 02:01:44 +02:00
|
|
|
if ctx.useVndk() {
|
2018-03-23 09:43:47 +01:00
|
|
|
vndk_ver := ctx.ctx.DeviceConfig().VndkVersion()
|
2018-03-27 06:25:27 +02:00
|
|
|
if vndk_ver == "current" {
|
2018-03-23 09:43:47 +01:00
|
|
|
platform_vndk_ver := ctx.ctx.DeviceConfig().PlatformVndkVersion()
|
|
|
|
if inList(platform_vndk_ver, ctx.ctx.Config().PlatformVersionCombinedCodenames()) {
|
|
|
|
return "current"
|
|
|
|
}
|
|
|
|
return platform_vndk_ver
|
|
|
|
}
|
|
|
|
return vndk_ver
|
2016-11-18 23:54:24 +01:00
|
|
|
}
|
2018-03-23 09:43:47 +01:00
|
|
|
return String(ctx.mod.Properties.Sdk_version)
|
2016-06-07 21:34:45 +02:00
|
|
|
}
|
|
|
|
return ""
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
func (ctx *moduleContextImpl) useVndk() bool {
|
|
|
|
return ctx.mod.useVndk()
|
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
func (ctx *moduleContextImpl) isVndk() bool {
|
|
|
|
return ctx.mod.isVndk()
|
|
|
|
}
|
|
|
|
|
2018-02-14 11:16:12 +01:00
|
|
|
func (ctx *moduleContextImpl) isPgoCompile() bool {
|
|
|
|
return ctx.mod.isPgoCompile()
|
|
|
|
}
|
|
|
|
|
2017-06-23 12:24:43 +02:00
|
|
|
func (ctx *moduleContextImpl) isVndkSp() bool {
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
return ctx.mod.isVndkSp()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ctx *moduleContextImpl) isVndkExt() bool {
|
|
|
|
return ctx.mod.isVndkExt()
|
2017-06-23 12:24:43 +02:00
|
|
|
}
|
|
|
|
|
2018-01-31 16:54:12 +01:00
|
|
|
func (ctx *moduleContextImpl) inRecovery() bool {
|
|
|
|
return ctx.mod.inRecovery()
|
|
|
|
}
|
|
|
|
|
2017-02-08 22:45:53 +01:00
|
|
|
// Create source abi dumps if the module belongs to the list of VndkLibraries.
|
|
|
|
func (ctx *moduleContextImpl) createVndkSourceAbiDump() bool {
|
2018-01-30 00:01:20 +01:00
|
|
|
skipAbiChecks := ctx.ctx.Config().IsEnvTrue("SKIP_ABI_CHECKS")
|
2018-05-11 00:29:24 +02:00
|
|
|
isVariantOnProductionDevice := true
|
2018-03-02 04:12:16 +01:00
|
|
|
sanitize := ctx.mod.sanitize
|
|
|
|
if sanitize != nil {
|
2018-05-11 00:29:24 +02:00
|
|
|
isVariantOnProductionDevice = sanitize.isVariantOnProductionDevice()
|
2018-03-02 04:12:16 +01:00
|
|
|
}
|
2018-03-06 23:59:50 +01:00
|
|
|
vendorAvailable := Bool(ctx.mod.VendorProperties.Vendor_available)
|
2018-05-11 00:29:24 +02:00
|
|
|
return !skipAbiChecks && isVariantOnProductionDevice && ctx.ctx.Device() && ((ctx.useVndk() && ctx.isVndk() && vendorAvailable) || inList(ctx.baseModuleName(), llndkLibraries))
|
2017-02-08 22:45:53 +01:00
|
|
|
}
|
|
|
|
|
2016-03-31 06:00:30 +02:00
|
|
|
func (ctx *moduleContextImpl) selectedStl() string {
|
|
|
|
if stl := ctx.mod.stl; stl != nil {
|
|
|
|
return stl.Properties.SelectedStl
|
|
|
|
}
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2016-10-07 01:12:58 +02:00
|
|
|
func (ctx *moduleContextImpl) baseModuleName() string {
|
|
|
|
return ctx.mod.ModuleBase.BaseModuleName()
|
|
|
|
}
|
|
|
|
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
func (ctx *moduleContextImpl) getVndkExtendsModuleName() string {
|
|
|
|
return ctx.mod.getVndkExtendsModuleName()
|
|
|
|
}
|
|
|
|
|
2016-05-19 00:37:25 +02:00
|
|
|
func newBaseModule(hod android.HostOrDeviceSupported, multilib android.Multilib) *Module {
|
2016-01-04 23:34:37 +01:00
|
|
|
return &Module{
|
|
|
|
hod: hod,
|
|
|
|
multilib: multilib,
|
2015-01-31 02:27:36 +01:00
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2016-05-19 00:37:25 +02:00
|
|
|
func newModule(hod android.HostOrDeviceSupported, multilib android.Multilib) *Module {
|
2016-01-04 23:34:37 +01:00
|
|
|
module := newBaseModule(hod, multilib)
|
2016-09-27 00:45:04 +02:00
|
|
|
module.features = []feature{
|
|
|
|
&tidyFeature{},
|
|
|
|
}
|
2016-04-05 00:07:06 +02:00
|
|
|
module.stl = &stl{}
|
2016-01-06 23:41:07 +01:00
|
|
|
module.sanitize = &sanitize{}
|
2017-02-10 01:16:31 +01:00
|
|
|
module.coverage = &coverage{}
|
2017-02-08 22:45:53 +01:00
|
|
|
module.sabi = &sabi{}
|
2017-06-23 12:24:43 +02:00
|
|
|
module.vndkdep = &vndkdep{}
|
2017-05-10 00:44:35 +02:00
|
|
|
module.lto = <o{}
|
2017-09-01 08:38:27 +02:00
|
|
|
module.pgo = &pgo{}
|
2016-01-04 23:34:37 +01:00
|
|
|
return module
|
|
|
|
}
|
2015-03-19 01:17:35 +01:00
|
|
|
|
2016-10-07 01:12:58 +02:00
|
|
|
func (c *Module) Prebuilt() *android.Prebuilt {
|
|
|
|
if p, ok := c.linker.(prebuiltLinkerInterface); ok {
|
|
|
|
return p.prebuilt()
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Module) Name() string {
|
|
|
|
name := c.ModuleBase.Name()
|
2017-04-08 00:21:13 +02:00
|
|
|
if p, ok := c.linker.(interface {
|
|
|
|
Name(string) string
|
|
|
|
}); ok {
|
2016-10-07 01:12:58 +02:00
|
|
|
name = p.Name(name)
|
|
|
|
}
|
|
|
|
return name
|
|
|
|
}
|
|
|
|
|
2017-09-28 02:05:30 +02:00
|
|
|
// orderDeps reorders dependencies into a list such that if module A depends on B, then
|
|
|
|
// A will precede B in the resultant list.
|
|
|
|
// This is convenient for passing into a linker.
|
2017-11-28 00:48:57 +01:00
|
|
|
// Note that directSharedDeps should be the analogous static library for each shared lib dep
|
|
|
|
func orderDeps(directStaticDeps []android.Path, directSharedDeps []android.Path, allTransitiveDeps map[android.Path][]android.Path) (orderedAllDeps []android.Path, orderedDeclaredDeps []android.Path) {
|
2017-09-28 02:05:30 +02:00
|
|
|
// If A depends on B, then
|
|
|
|
// Every list containing A will also contain B later in the list
|
|
|
|
// So, after concatenating all lists, the final instance of B will have come from the same
|
|
|
|
// original list as the final instance of A
|
|
|
|
// So, the final instance of B will be later in the concatenation than the final A
|
|
|
|
// So, keeping only the final instance of A and of B ensures that A is earlier in the output
|
|
|
|
// list than B
|
2017-11-28 00:48:57 +01:00
|
|
|
for _, dep := range directStaticDeps {
|
|
|
|
orderedAllDeps = append(orderedAllDeps, dep)
|
|
|
|
orderedAllDeps = append(orderedAllDeps, allTransitiveDeps[dep]...)
|
|
|
|
}
|
|
|
|
for _, dep := range directSharedDeps {
|
2017-09-28 02:05:30 +02:00
|
|
|
orderedAllDeps = append(orderedAllDeps, dep)
|
2017-11-28 00:48:57 +01:00
|
|
|
orderedAllDeps = append(orderedAllDeps, allTransitiveDeps[dep]...)
|
2017-09-28 02:05:30 +02:00
|
|
|
}
|
|
|
|
|
2017-10-24 20:13:31 +02:00
|
|
|
orderedAllDeps = android.LastUniquePaths(orderedAllDeps)
|
2017-09-28 02:05:30 +02:00
|
|
|
|
2017-11-28 00:48:57 +01:00
|
|
|
// We don't want to add any new dependencies into directStaticDeps (to allow the caller to
|
2017-09-28 02:05:30 +02:00
|
|
|
// intentionally exclude or replace any unwanted transitive dependencies), so we limit the
|
2017-11-28 00:48:57 +01:00
|
|
|
// resultant list to only what the caller has chosen to include in directStaticDeps
|
|
|
|
_, orderedDeclaredDeps = android.FilterPathList(orderedAllDeps, directStaticDeps)
|
2017-09-28 02:05:30 +02:00
|
|
|
|
|
|
|
return orderedAllDeps, orderedDeclaredDeps
|
|
|
|
}
|
|
|
|
|
2017-11-28 00:48:57 +01:00
|
|
|
func orderStaticModuleDeps(module *Module, staticDeps []*Module, sharedDeps []*Module) (results []android.Path) {
|
|
|
|
// convert Module to Path
|
|
|
|
allTransitiveDeps := make(map[android.Path][]android.Path, len(staticDeps))
|
|
|
|
staticDepFiles := []android.Path{}
|
|
|
|
for _, dep := range staticDeps {
|
|
|
|
allTransitiveDeps[dep.outputFile.Path()] = dep.depsInLinkOrder
|
|
|
|
staticDepFiles = append(staticDepFiles, dep.outputFile.Path())
|
|
|
|
}
|
|
|
|
sharedDepFiles := []android.Path{}
|
|
|
|
for _, sharedDep := range sharedDeps {
|
|
|
|
staticAnalogue := sharedDep.staticVariant
|
|
|
|
if staticAnalogue != nil {
|
|
|
|
allTransitiveDeps[staticAnalogue.outputFile.Path()] = staticAnalogue.depsInLinkOrder
|
|
|
|
sharedDepFiles = append(sharedDepFiles, staticAnalogue.outputFile.Path())
|
|
|
|
}
|
2017-09-28 02:05:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// reorder the dependencies based on transitive dependencies
|
2017-11-28 00:48:57 +01:00
|
|
|
module.depsInLinkOrder, results = orderDeps(staticDepFiles, sharedDepFiles, allTransitiveDeps)
|
2017-09-28 02:05:30 +02:00
|
|
|
|
|
|
|
return results
|
|
|
|
}
|
|
|
|
|
2016-05-19 00:37:25 +02:00
|
|
|
func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
|
2016-01-04 23:34:37 +01:00
|
|
|
ctx := &moduleContext{
|
2016-05-19 00:37:25 +02:00
|
|
|
ModuleContext: actx,
|
2016-01-04 23:34:37 +01:00
|
|
|
moduleContextImpl: moduleContextImpl{
|
|
|
|
mod: c,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx.ctx = ctx
|
|
|
|
|
2017-11-16 23:33:08 +01:00
|
|
|
deps := c.depsToPaths(ctx)
|
|
|
|
if ctx.Failed() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
flags := Flags{
|
|
|
|
Toolchain: c.toolchain(ctx),
|
|
|
|
Clang: c.clang(ctx),
|
2015-01-31 02:27:36 +01:00
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
if c.compiler != nil {
|
2017-11-16 23:33:08 +01:00
|
|
|
flags = c.compiler.compilerFlags(ctx, flags, deps)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
if c.linker != nil {
|
2016-08-01 22:20:05 +02:00
|
|
|
flags = c.linker.linkerFlags(ctx, flags)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2016-04-05 00:07:06 +02:00
|
|
|
if c.stl != nil {
|
|
|
|
flags = c.stl.flags(ctx, flags)
|
|
|
|
}
|
2016-01-06 23:41:07 +01:00
|
|
|
if c.sanitize != nil {
|
|
|
|
flags = c.sanitize.flags(ctx, flags)
|
|
|
|
}
|
2017-02-10 01:16:31 +01:00
|
|
|
if c.coverage != nil {
|
|
|
|
flags = c.coverage.flags(ctx, flags)
|
|
|
|
}
|
2017-05-10 00:44:35 +02:00
|
|
|
if c.lto != nil {
|
|
|
|
flags = c.lto.flags(ctx, flags)
|
|
|
|
}
|
2017-09-01 08:38:27 +02:00
|
|
|
if c.pgo != nil {
|
|
|
|
flags = c.pgo.flags(ctx, flags)
|
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
for _, feature := range c.features {
|
|
|
|
flags = feature.flags(ctx, flags)
|
|
|
|
}
|
2015-03-18 21:28:46 +01:00
|
|
|
if ctx.Failed() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-07-29 22:44:28 +02:00
|
|
|
flags.CFlags, _ = filterList(flags.CFlags, config.IllegalFlags)
|
|
|
|
flags.CppFlags, _ = filterList(flags.CppFlags, config.IllegalFlags)
|
|
|
|
flags.ConlyFlags, _ = filterList(flags.ConlyFlags, config.IllegalFlags)
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2017-01-11 01:21:22 +01:00
|
|
|
flags.GlobalFlags = append(flags.GlobalFlags, deps.Flags...)
|
|
|
|
c.flags = flags
|
2017-06-15 23:45:18 +02:00
|
|
|
// We need access to all the flags seen by a source file.
|
|
|
|
if c.sabi != nil {
|
|
|
|
flags = c.sabi.flags(ctx, flags)
|
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
// Optimization to reduce size of build.ninja
|
|
|
|
// Replace the long list of flags for each file with a module-local variable
|
|
|
|
ctx.Variable(pctx, "cflags", strings.Join(flags.CFlags, " "))
|
|
|
|
ctx.Variable(pctx, "cppflags", strings.Join(flags.CppFlags, " "))
|
|
|
|
ctx.Variable(pctx, "asflags", strings.Join(flags.AsFlags, " "))
|
|
|
|
flags.CFlags = []string{"$cflags"}
|
|
|
|
flags.CppFlags = []string{"$cppflags"}
|
|
|
|
flags.AsFlags = []string{"$asflags"}
|
2015-03-18 21:28:46 +01:00
|
|
|
|
2016-09-27 02:33:01 +02:00
|
|
|
var objs Objects
|
2016-01-04 23:34:37 +01:00
|
|
|
if c.compiler != nil {
|
2016-09-27 02:33:01 +02:00
|
|
|
objs = c.compiler.compile(ctx, flags, deps)
|
2016-01-04 23:34:37 +01:00
|
|
|
if ctx.Failed() {
|
|
|
|
return
|
|
|
|
}
|
2015-03-18 22:01:18 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
if c.linker != nil {
|
2016-09-27 02:33:01 +02:00
|
|
|
outputFile := c.linker.link(ctx, flags, deps, objs)
|
2016-01-04 23:34:37 +01:00
|
|
|
if ctx.Failed() {
|
|
|
|
return
|
|
|
|
}
|
2016-05-19 00:37:25 +02:00
|
|
|
c.outputFile = android.OptionalPathForPath(outputFile)
|
2016-10-07 01:12:58 +02:00
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2016-10-07 01:12:58 +02:00
|
|
|
if c.installer != nil && !c.Properties.PreventInstall && c.outputFile.Valid() {
|
|
|
|
c.installer.install(ctx, c.outputFile.Path())
|
|
|
|
if ctx.Failed() {
|
|
|
|
return
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
}
|
|
|
|
|
2016-07-29 22:44:28 +02:00
|
|
|
func (c *Module) toolchain(ctx BaseModuleContext) config.Toolchain {
|
2016-01-04 23:34:37 +01:00
|
|
|
if c.cachedToolchain == nil {
|
2016-07-29 22:44:28 +02:00
|
|
|
c.cachedToolchain = config.FindToolchain(ctx.Os(), ctx.Arch())
|
2015-01-31 02:27:36 +01:00
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
return c.cachedToolchain
|
2015-01-31 02:27:36 +01:00
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
func (c *Module) begin(ctx BaseModuleContext) {
|
|
|
|
if c.compiler != nil {
|
2016-08-01 22:20:05 +02:00
|
|
|
c.compiler.compilerInit(ctx)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
if c.linker != nil {
|
2016-08-01 22:20:05 +02:00
|
|
|
c.linker.linkerInit(ctx)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2016-04-05 00:07:06 +02:00
|
|
|
if c.stl != nil {
|
|
|
|
c.stl.begin(ctx)
|
|
|
|
}
|
2016-01-06 23:41:07 +01:00
|
|
|
if c.sanitize != nil {
|
|
|
|
c.sanitize.begin(ctx)
|
|
|
|
}
|
2017-02-10 01:16:31 +01:00
|
|
|
if c.coverage != nil {
|
|
|
|
c.coverage.begin(ctx)
|
|
|
|
}
|
2017-02-08 22:45:53 +01:00
|
|
|
if c.sabi != nil {
|
|
|
|
c.sabi.begin(ctx)
|
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
if c.vndkdep != nil {
|
|
|
|
c.vndkdep.begin(ctx)
|
|
|
|
}
|
2017-05-10 00:44:35 +02:00
|
|
|
if c.lto != nil {
|
|
|
|
c.lto.begin(ctx)
|
|
|
|
}
|
2017-09-01 08:38:27 +02:00
|
|
|
if c.pgo != nil {
|
|
|
|
c.pgo.begin(ctx)
|
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
for _, feature := range c.features {
|
|
|
|
feature.begin(ctx)
|
|
|
|
}
|
2017-09-28 02:01:44 +02:00
|
|
|
if ctx.useSdk() {
|
2017-08-18 01:19:59 +02:00
|
|
|
version, err := normalizeNdkApiLevel(ctx, ctx.sdkVersion(), ctx.Arch())
|
2016-08-06 01:37:52 +02:00
|
|
|
if err != nil {
|
|
|
|
ctx.PropertyErrorf("sdk_version", err.Error())
|
|
|
|
}
|
2017-11-07 19:57:05 +01:00
|
|
|
c.Properties.Sdk_version = StringPtr(version)
|
2016-08-06 01:37:52 +02:00
|
|
|
}
|
2015-04-25 02:31:52 +02:00
|
|
|
}
|
|
|
|
|
2016-12-14 02:06:13 +01:00
|
|
|
func (c *Module) deps(ctx DepsContext) Deps {
|
2016-04-12 00:06:20 +02:00
|
|
|
deps := Deps{}
|
|
|
|
|
|
|
|
if c.compiler != nil {
|
2016-08-01 22:20:05 +02:00
|
|
|
deps = c.compiler.compilerDeps(ctx, deps)
|
2016-04-12 00:06:20 +02:00
|
|
|
}
|
2018-04-24 00:44:39 +02:00
|
|
|
// Add the PGO dependency (the clang_rt.profile runtime library), which
|
|
|
|
// sometimes depends on symbols from libgcc, before libgcc gets added
|
|
|
|
// in linkerDeps().
|
2017-10-05 01:47:29 +02:00
|
|
|
if c.pgo != nil {
|
|
|
|
deps = c.pgo.deps(ctx, deps)
|
|
|
|
}
|
2016-04-12 00:06:20 +02:00
|
|
|
if c.linker != nil {
|
2016-08-01 22:20:05 +02:00
|
|
|
deps = c.linker.linkerDeps(ctx, deps)
|
2016-04-12 00:06:20 +02:00
|
|
|
}
|
2016-04-05 00:07:06 +02:00
|
|
|
if c.stl != nil {
|
|
|
|
deps = c.stl.deps(ctx, deps)
|
|
|
|
}
|
2016-01-06 23:41:07 +01:00
|
|
|
if c.sanitize != nil {
|
|
|
|
deps = c.sanitize.deps(ctx, deps)
|
|
|
|
}
|
2018-04-24 00:44:39 +02:00
|
|
|
if c.coverage != nil {
|
|
|
|
deps = c.coverage.deps(ctx, deps)
|
|
|
|
}
|
2017-02-08 22:45:53 +01:00
|
|
|
if c.sabi != nil {
|
|
|
|
deps = c.sabi.deps(ctx, deps)
|
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
if c.vndkdep != nil {
|
|
|
|
deps = c.vndkdep.deps(ctx, deps)
|
|
|
|
}
|
2017-05-10 00:44:35 +02:00
|
|
|
if c.lto != nil {
|
|
|
|
deps = c.lto.deps(ctx, deps)
|
|
|
|
}
|
2016-04-12 00:06:20 +02:00
|
|
|
for _, feature := range c.features {
|
|
|
|
deps = feature.deps(ctx, deps)
|
|
|
|
}
|
|
|
|
|
2017-10-24 20:13:31 +02:00
|
|
|
deps.WholeStaticLibs = android.LastUniqueStrings(deps.WholeStaticLibs)
|
|
|
|
deps.StaticLibs = android.LastUniqueStrings(deps.StaticLibs)
|
|
|
|
deps.LateStaticLibs = android.LastUniqueStrings(deps.LateStaticLibs)
|
|
|
|
deps.SharedLibs = android.LastUniqueStrings(deps.SharedLibs)
|
|
|
|
deps.LateSharedLibs = android.LastUniqueStrings(deps.LateSharedLibs)
|
|
|
|
deps.HeaderLibs = android.LastUniqueStrings(deps.HeaderLibs)
|
2017-12-19 18:17:32 +01:00
|
|
|
deps.RuntimeLibs = android.LastUniqueStrings(deps.RuntimeLibs)
|
2016-04-12 00:06:20 +02:00
|
|
|
|
2016-06-07 03:22:19 +02:00
|
|
|
for _, lib := range deps.ReexportSharedLibHeaders {
|
|
|
|
if !inList(lib, deps.SharedLibs) {
|
|
|
|
ctx.PropertyErrorf("export_shared_lib_headers", "Shared library not in shared_libs: '%s'", lib)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, lib := range deps.ReexportStaticLibHeaders {
|
|
|
|
if !inList(lib, deps.StaticLibs) {
|
|
|
|
ctx.PropertyErrorf("export_static_lib_headers", "Static library not in static_libs: '%s'", lib)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-13 21:50:57 +01:00
|
|
|
for _, lib := range deps.ReexportHeaderLibHeaders {
|
|
|
|
if !inList(lib, deps.HeaderLibs) {
|
|
|
|
ctx.PropertyErrorf("export_header_lib_headers", "Header library not in header_libs: '%s'", lib)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-29 02:34:58 +02:00
|
|
|
for _, gen := range deps.ReexportGeneratedHeaders {
|
|
|
|
if !inList(gen, deps.GeneratedHeaders) {
|
|
|
|
ctx.PropertyErrorf("export_generated_headers", "Generated header module not in generated_headers: '%s'", gen)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-12 00:06:20 +02:00
|
|
|
return deps
|
|
|
|
}
|
|
|
|
|
2016-08-04 22:02:36 +02:00
|
|
|
func (c *Module) beginMutator(actx android.BottomUpMutatorContext) {
|
2016-01-04 23:34:37 +01:00
|
|
|
ctx := &baseModuleContext{
|
2016-05-19 00:37:25 +02:00
|
|
|
BaseContext: actx,
|
2016-01-04 23:34:37 +01:00
|
|
|
moduleContextImpl: moduleContextImpl{
|
|
|
|
mod: c,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx.ctx = ctx
|
2015-03-24 22:15:58 +01:00
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
c.begin(ctx)
|
2016-08-04 22:02:36 +02:00
|
|
|
}
|
|
|
|
|
2016-10-12 23:38:15 +02:00
|
|
|
func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
|
|
|
|
if !c.Enabled() {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2016-12-14 02:06:13 +01:00
|
|
|
ctx := &depsContext{
|
|
|
|
BottomUpMutatorContext: actx,
|
2016-08-04 22:02:36 +02:00
|
|
|
moduleContextImpl: moduleContextImpl{
|
|
|
|
mod: c,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
ctx.ctx = ctx
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2016-04-12 00:06:20 +02:00
|
|
|
deps := c.deps(ctx)
|
2015-04-28 22:30:13 +02:00
|
|
|
|
2016-06-18 01:45:24 +02:00
|
|
|
variantNdkLibs := []string{}
|
|
|
|
variantLateNdkLibs := []string{}
|
2017-03-19 21:44:32 +01:00
|
|
|
if ctx.Os() == android.Android {
|
2016-06-18 01:45:24 +02:00
|
|
|
version := ctx.sdkVersion()
|
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
// rewriteNdkLibs takes a list of names of shared libraries and scans it for three types
|
|
|
|
// of names:
|
2016-06-18 01:45:24 +02:00
|
|
|
//
|
2017-09-28 02:01:44 +02:00
|
|
|
// 1. Name of an NDK library that refers to a prebuilt module.
|
|
|
|
// For each of these, it adds the name of the prebuilt module (which will be in
|
|
|
|
// prebuilts/ndk) to the list of nonvariant libs.
|
|
|
|
// 2. Name of an NDK library that refers to an ndk_library module.
|
|
|
|
// For each of these, it adds the name of the ndk_library module to the list of
|
|
|
|
// variant libs.
|
|
|
|
// 3. Anything else (so anything that isn't an NDK library).
|
|
|
|
// It adds these to the nonvariantLibs list.
|
2016-06-18 01:45:24 +02:00
|
|
|
//
|
2017-09-28 02:01:44 +02:00
|
|
|
// The caller can then know to add the variantLibs dependencies differently from the
|
|
|
|
// nonvariantLibs
|
|
|
|
rewriteNdkLibs := func(list []string) (nonvariantLibs []string, variantLibs []string) {
|
|
|
|
variantLibs = []string{}
|
|
|
|
nonvariantLibs = []string{}
|
2016-06-18 01:45:24 +02:00
|
|
|
for _, entry := range list {
|
2017-09-28 02:01:44 +02:00
|
|
|
if ctx.useSdk() && inList(entry, ndkPrebuiltSharedLibraries) {
|
2016-06-18 01:45:24 +02:00
|
|
|
if !inList(entry, ndkMigratedLibs) {
|
|
|
|
nonvariantLibs = append(nonvariantLibs, entry+".ndk."+version)
|
|
|
|
} else {
|
|
|
|
variantLibs = append(variantLibs, entry+ndkLibrarySuffix)
|
|
|
|
}
|
2017-09-28 02:01:44 +02:00
|
|
|
} else if ctx.useVndk() && inList(entry, llndkLibraries) {
|
2017-03-19 21:44:32 +01:00
|
|
|
nonvariantLibs = append(nonvariantLibs, entry+llndkLibrarySuffix)
|
Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.
However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).
This change provides a way to make a vendor lib as public by defining a
module of type 'vendor_public_library' with a map file that enumerates
public symbols that are publicized:
cc_library {
name: "libvendor",
proprietary: true,
...
}
vendor_public_library {
name: "libvendor",
symbol_file: "libvendor.map.txt",
}
This defines a stub library module named libvendor.vendorpublic from the
map file. `shared_libs: ["libvendor"]` is redirected to the stub library
when it is from the outside of the vendor partition.
Bug: 74275385
Test: m -j
Test: cc_test.go passes
Change-Id: I5bed94d7c4282b777632ab2f0fb63c203ee313ba
2018-03-19 10:23:01 +01:00
|
|
|
} else if (ctx.Platform() || ctx.ProductSpecific()) && inList(entry, vendorPublicLibraries) {
|
|
|
|
vendorPublicLib := entry + vendorPublicLibrarySuffix
|
|
|
|
if actx.OtherModuleExists(vendorPublicLib) {
|
|
|
|
nonvariantLibs = append(nonvariantLibs, vendorPublicLib)
|
|
|
|
} else {
|
|
|
|
// This can happen if vendor_public_library module is defined in a
|
|
|
|
// namespace that isn't visible to the current module. In that case,
|
|
|
|
// link to the original library.
|
|
|
|
nonvariantLibs = append(nonvariantLibs, entry)
|
|
|
|
}
|
2016-06-18 01:45:24 +02:00
|
|
|
} else {
|
2017-03-28 09:08:30 +02:00
|
|
|
nonvariantLibs = append(nonvariantLibs, entry)
|
2016-07-09 08:23:48 +02:00
|
|
|
}
|
|
|
|
}
|
2016-06-18 01:45:24 +02:00
|
|
|
return nonvariantLibs, variantLibs
|
2016-07-09 08:23:48 +02:00
|
|
|
}
|
|
|
|
|
2016-06-18 01:45:24 +02:00
|
|
|
deps.SharedLibs, variantNdkLibs = rewriteNdkLibs(deps.SharedLibs)
|
|
|
|
deps.LateSharedLibs, variantLateNdkLibs = rewriteNdkLibs(deps.LateSharedLibs)
|
2017-07-05 06:41:55 +02:00
|
|
|
deps.ReexportSharedLibHeaders, _ = rewriteNdkLibs(deps.ReexportSharedLibHeaders)
|
2016-07-09 08:23:48 +02:00
|
|
|
}
|
2016-04-12 00:06:20 +02:00
|
|
|
|
2016-12-15 16:39:51 +01:00
|
|
|
for _, lib := range deps.HeaderLibs {
|
|
|
|
depTag := headerDepTag
|
|
|
|
if inList(lib, deps.ReexportHeaderLibHeaders) {
|
|
|
|
depTag = headerExportDepTag
|
|
|
|
}
|
|
|
|
actx.AddVariationDependencies(nil, depTag, lib)
|
|
|
|
}
|
2016-12-13 21:50:57 +01:00
|
|
|
|
2016-04-12 00:06:20 +02:00
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, wholeStaticDepTag,
|
|
|
|
deps.WholeStaticLibs...)
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2016-06-07 03:22:19 +02:00
|
|
|
for _, lib := range deps.StaticLibs {
|
|
|
|
depTag := staticDepTag
|
|
|
|
if inList(lib, deps.ReexportStaticLibHeaders) {
|
|
|
|
depTag = staticExportDepTag
|
|
|
|
}
|
2016-07-14 23:49:58 +02:00
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, depTag, lib)
|
2016-06-07 03:22:19 +02:00
|
|
|
}
|
2015-03-24 22:15:58 +01:00
|
|
|
|
2016-04-12 00:06:20 +02:00
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, lateStaticDepTag,
|
|
|
|
deps.LateStaticLibs...)
|
2015-03-24 22:15:58 +01:00
|
|
|
|
2016-06-07 03:22:19 +02:00
|
|
|
for _, lib := range deps.SharedLibs {
|
|
|
|
depTag := sharedDepTag
|
|
|
|
if inList(lib, deps.ReexportSharedLibHeaders) {
|
|
|
|
depTag = sharedExportDepTag
|
|
|
|
}
|
2016-07-14 23:49:58 +02:00
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, depTag, lib)
|
2016-06-07 03:22:19 +02:00
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2016-04-12 00:06:20 +02:00
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, lateSharedDepTag,
|
|
|
|
deps.LateSharedLibs...)
|
2016-04-11 23:37:39 +02:00
|
|
|
|
2017-12-19 18:17:32 +01:00
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, runtimeDepTag,
|
|
|
|
deps.RuntimeLibs...)
|
|
|
|
|
2016-07-08 19:41:41 +02:00
|
|
|
actx.AddDependency(c, genSourceDepTag, deps.GeneratedSources...)
|
2016-09-29 02:34:58 +02:00
|
|
|
|
|
|
|
for _, gen := range deps.GeneratedHeaders {
|
|
|
|
depTag := genHeaderDepTag
|
|
|
|
if inList(gen, deps.ReexportGeneratedHeaders) {
|
|
|
|
depTag = genHeaderExportDepTag
|
|
|
|
}
|
|
|
|
actx.AddDependency(c, depTag, gen)
|
|
|
|
}
|
2016-04-20 23:21:14 +02:00
|
|
|
|
2016-07-08 19:41:41 +02:00
|
|
|
actx.AddDependency(c, objDepTag, deps.ObjFiles...)
|
2016-04-12 00:06:20 +02:00
|
|
|
|
|
|
|
if deps.CrtBegin != "" {
|
2016-07-08 19:41:41 +02:00
|
|
|
actx.AddDependency(c, crtBeginDepTag, deps.CrtBegin)
|
2015-03-24 22:15:58 +01:00
|
|
|
}
|
2016-04-12 00:06:20 +02:00
|
|
|
if deps.CrtEnd != "" {
|
2016-07-08 19:41:41 +02:00
|
|
|
actx.AddDependency(c, crtEndDepTag, deps.CrtEnd)
|
2015-03-24 22:15:58 +01:00
|
|
|
}
|
2017-09-19 08:19:12 +02:00
|
|
|
if deps.LinkerScript != "" {
|
|
|
|
actx.AddDependency(c, linkerScriptDepTag, deps.LinkerScript)
|
|
|
|
}
|
2016-06-18 01:45:24 +02:00
|
|
|
|
|
|
|
version := ctx.sdkVersion()
|
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{
|
|
|
|
{"ndk_api", version}, {"link", "shared"}}, ndkStubDepTag, variantNdkLibs...)
|
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{
|
|
|
|
{"ndk_api", version}, {"link", "shared"}}, ndkLateStubDepTag, variantLateNdkLibs...)
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
|
|
|
|
if vndkdep := c.vndkdep; vndkdep != nil {
|
|
|
|
if vndkdep.isVndkExt() {
|
|
|
|
baseModuleMode := vendorMode
|
|
|
|
if actx.DeviceConfig().VndkVersion() == "" {
|
|
|
|
baseModuleMode = coreMode
|
|
|
|
}
|
|
|
|
actx.AddVariationDependencies([]blueprint.Variation{
|
|
|
|
{"image", baseModuleMode}, {"link", "shared"}}, vndkExtDepTag,
|
|
|
|
vndkdep.getVndkExtendsModuleName())
|
|
|
|
}
|
|
|
|
}
|
2015-10-29 23:25:03 +01:00
|
|
|
}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2016-08-04 22:02:36 +02:00
|
|
|
func beginMutator(ctx android.BottomUpMutatorContext) {
|
|
|
|
if c, ok := ctx.Module().(*Module); ok && c.Enabled() {
|
|
|
|
c.beginMutator(ctx)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
func (c *Module) clang(ctx BaseModuleContext) bool {
|
|
|
|
clang := Bool(c.Properties.Clang)
|
|
|
|
|
|
|
|
if c.Properties.Clang == nil {
|
2018-01-11 20:56:19 +01:00
|
|
|
clang = true
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if !c.toolchain(ctx).ClangSupported() {
|
|
|
|
clang = false
|
|
|
|
}
|
|
|
|
|
|
|
|
return clang
|
|
|
|
}
|
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
// Whether a module can link to another module, taking into
|
|
|
|
// account NDK linking.
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
func checkLinkType(ctx android.ModuleContext, from *Module, to *Module, tag dependencyTag) {
|
2017-09-28 02:01:44 +02:00
|
|
|
if from.Target().Os != android.Android {
|
|
|
|
// Host code is not restricted
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if from.Properties.UseVndk {
|
|
|
|
// Though vendor code is limited by the vendor mutator,
|
|
|
|
// each vendor-available module needs to check
|
|
|
|
// link-type for VNDK.
|
|
|
|
if from.vndkdep != nil {
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
from.vndkdep.vndkCheckLinkType(ctx, to, tag)
|
2016-08-03 23:12:14 +02:00
|
|
|
}
|
2017-09-28 02:01:44 +02:00
|
|
|
return
|
|
|
|
}
|
2017-11-07 19:57:05 +01:00
|
|
|
if String(from.Properties.Sdk_version) == "" {
|
2017-09-28 02:01:44 +02:00
|
|
|
// Platform code can link to anything
|
|
|
|
return
|
|
|
|
}
|
2018-01-31 16:54:12 +01:00
|
|
|
if from.inRecovery() {
|
|
|
|
// Recovery code is not NDK
|
|
|
|
return
|
|
|
|
}
|
2017-09-28 02:01:44 +02:00
|
|
|
if _, ok := to.linker.(*toolchainLibraryDecorator); ok {
|
|
|
|
// These are always allowed
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if _, ok := to.linker.(*ndkPrebuiltStlLinker); ok {
|
|
|
|
// These are allowed, but they don't set sdk_version
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if _, ok := to.linker.(*stubDecorator); ok {
|
|
|
|
// These aren't real libraries, but are the stub shared libraries that are included in
|
|
|
|
// the NDK.
|
|
|
|
return
|
|
|
|
}
|
2017-11-07 19:57:05 +01:00
|
|
|
if String(to.Properties.Sdk_version) == "" {
|
2017-09-28 02:01:44 +02:00
|
|
|
// NDK code linking to platform code is never okay.
|
|
|
|
ctx.ModuleErrorf("depends on non-NDK-built library %q",
|
|
|
|
ctx.OtherModuleName(to))
|
|
|
|
}
|
2016-08-03 23:12:14 +02:00
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
// At this point we know we have two NDK libraries, but we need to
|
|
|
|
// check that we're not linking against anything built against a higher
|
|
|
|
// API level, as it is only valid to link against older or equivalent
|
|
|
|
// APIs.
|
2016-08-03 23:12:14 +02:00
|
|
|
|
2018-04-11 02:48:45 +02:00
|
|
|
// Current can link against anything.
|
|
|
|
if String(from.Properties.Sdk_version) != "current" {
|
|
|
|
// Otherwise we need to check.
|
|
|
|
if String(to.Properties.Sdk_version) == "current" {
|
|
|
|
// Current can't be linked against by anything else.
|
|
|
|
ctx.ModuleErrorf("links %q built against newer API version %q",
|
|
|
|
ctx.OtherModuleName(to), "current")
|
|
|
|
} else {
|
|
|
|
fromApi, err := strconv.Atoi(String(from.Properties.Sdk_version))
|
|
|
|
if err != nil {
|
|
|
|
ctx.PropertyErrorf("sdk_version",
|
2018-04-11 03:13:16 +02:00
|
|
|
"Invalid sdk_version value (must be int or current): %q",
|
2018-04-11 02:48:45 +02:00
|
|
|
String(from.Properties.Sdk_version))
|
|
|
|
}
|
|
|
|
toApi, err := strconv.Atoi(String(to.Properties.Sdk_version))
|
|
|
|
if err != nil {
|
|
|
|
ctx.PropertyErrorf("sdk_version",
|
2018-04-11 03:13:16 +02:00
|
|
|
"Invalid sdk_version value (must be int or current): %q",
|
2018-04-11 02:48:45 +02:00
|
|
|
String(to.Properties.Sdk_version))
|
|
|
|
}
|
2016-08-03 23:12:14 +02:00
|
|
|
|
2018-04-11 02:48:45 +02:00
|
|
|
if toApi > fromApi {
|
|
|
|
ctx.ModuleErrorf("links %q built against newer API version %q",
|
|
|
|
ctx.OtherModuleName(to), String(to.Properties.Sdk_version))
|
|
|
|
}
|
|
|
|
}
|
2016-06-07 21:34:45 +02:00
|
|
|
}
|
2017-12-15 22:56:59 +01:00
|
|
|
|
|
|
|
// Also check that the two STL choices are compatible.
|
|
|
|
fromStl := from.stl.Properties.SelectedStl
|
|
|
|
toStl := to.stl.Properties.SelectedStl
|
|
|
|
if fromStl == "" || toStl == "" {
|
|
|
|
// Libraries that don't use the STL are unrestricted.
|
2018-04-11 08:41:38 +02:00
|
|
|
} else if fromStl == "ndk_system" || toStl == "ndk_system" {
|
2017-12-15 22:56:59 +01:00
|
|
|
// We can be permissive with the system "STL" since it is only the C++
|
|
|
|
// ABI layer, but in the future we should make sure that everyone is
|
|
|
|
// using either libc++ or nothing.
|
2018-04-11 08:41:38 +02:00
|
|
|
} else if getNdkStlFamily(ctx, from) != getNdkStlFamily(ctx, to) {
|
2017-12-15 22:56:59 +01:00
|
|
|
ctx.ModuleErrorf("uses %q and depends on %q which uses incompatible %q",
|
|
|
|
from.stl.Properties.SelectedStl, ctx.OtherModuleName(to),
|
|
|
|
to.stl.Properties.SelectedStl)
|
|
|
|
}
|
2017-09-28 02:01:44 +02:00
|
|
|
}
|
2016-06-07 21:34:45 +02:00
|
|
|
|
2018-04-09 05:03:06 +02:00
|
|
|
// Tests whether the dependent library is okay to be double loaded inside a single process.
|
|
|
|
// If a library is a member of VNDK and at the same time dependencies of an LLNDK library,
|
|
|
|
// it is subject to be double loaded. Such lib should be explicitly marked as double_loaded: true
|
|
|
|
// or as vndk-sp (vndk: { enabled: true, support_system_process: true}).
|
|
|
|
func checkDoubleLoadableLibries(ctx android.ModuleContext, from *Module, to *Module) {
|
|
|
|
if _, ok := from.linker.(*libraryDecorator); !ok {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if inList(ctx.ModuleName(), llndkLibraries) ||
|
|
|
|
(from.useVndk() && Bool(from.VendorProperties.Double_loadable)) {
|
|
|
|
_, depIsLlndk := to.linker.(*llndkStubDecorator)
|
|
|
|
depIsVndkSp := false
|
|
|
|
if to.vndkdep != nil && to.vndkdep.isVndkSp() {
|
|
|
|
depIsVndkSp = true
|
|
|
|
}
|
|
|
|
depIsVndk := false
|
|
|
|
if to.vndkdep != nil && to.vndkdep.isVndk() {
|
|
|
|
depIsVndk = true
|
|
|
|
}
|
|
|
|
depIsDoubleLoadable := Bool(to.VendorProperties.Double_loadable)
|
|
|
|
if !depIsLlndk && !depIsVndkSp && !depIsDoubleLoadable && depIsVndk {
|
|
|
|
ctx.ModuleErrorf("links VNDK library %q that isn't double_loadable.",
|
|
|
|
ctx.OtherModuleName(to))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
// Convert dependencies to paths. Returns a PathDeps containing paths
|
|
|
|
func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
|
|
|
|
var depPaths PathDeps
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2017-09-28 02:05:30 +02:00
|
|
|
directStaticDeps := []*Module{}
|
2017-11-28 00:48:57 +01:00
|
|
|
directSharedDeps := []*Module{}
|
2017-09-28 02:05:30 +02:00
|
|
|
|
2017-10-24 02:59:01 +02:00
|
|
|
ctx.VisitDirectDeps(func(dep android.Module) {
|
2017-09-28 02:01:44 +02:00
|
|
|
depName := ctx.OtherModuleName(dep)
|
|
|
|
depTag := ctx.OtherModuleDependencyTag(dep)
|
|
|
|
|
|
|
|
ccDep, _ := dep.(*Module)
|
|
|
|
if ccDep == nil {
|
|
|
|
// handling for a few module types that aren't cc Module but that are also supported
|
|
|
|
switch depTag {
|
2016-12-14 00:23:47 +01:00
|
|
|
case android.DefaultsDepTag, android.SourceDepTag:
|
2017-09-14 00:46:47 +02:00
|
|
|
// Nothing to do
|
2016-04-20 23:21:14 +02:00
|
|
|
case genSourceDepTag:
|
2017-09-28 02:01:44 +02:00
|
|
|
if genRule, ok := dep.(genrule.SourceFileGenerator); ok {
|
2016-04-20 23:21:14 +02:00
|
|
|
depPaths.GeneratedSources = append(depPaths.GeneratedSources,
|
|
|
|
genRule.GeneratedSourceFiles()...)
|
|
|
|
} else {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("module %q is not a gensrcs or genrule", depName)
|
2016-04-20 23:21:14 +02:00
|
|
|
}
|
2017-04-27 01:59:26 +02:00
|
|
|
// Support exported headers from a generated_sources dependency
|
|
|
|
fallthrough
|
2016-09-29 02:34:58 +02:00
|
|
|
case genHeaderDepTag, genHeaderExportDepTag:
|
2017-09-28 02:01:44 +02:00
|
|
|
if genRule, ok := dep.(genrule.SourceFileGenerator); ok {
|
2016-04-20 23:21:14 +02:00
|
|
|
depPaths.GeneratedHeaders = append(depPaths.GeneratedHeaders,
|
2018-02-22 03:28:18 +01:00
|
|
|
genRule.GeneratedDeps()...)
|
2016-11-22 21:55:55 +01:00
|
|
|
flags := includeDirsToFlags(genRule.GeneratedHeaderDirs())
|
2016-09-29 02:34:58 +02:00
|
|
|
depPaths.Flags = append(depPaths.Flags, flags)
|
2017-09-28 02:01:44 +02:00
|
|
|
if depTag == genHeaderExportDepTag {
|
2016-09-29 02:34:58 +02:00
|
|
|
depPaths.ReexportedFlags = append(depPaths.ReexportedFlags, flags)
|
2016-09-29 21:13:36 +02:00
|
|
|
depPaths.ReexportedFlagsDeps = append(depPaths.ReexportedFlagsDeps,
|
2018-02-22 03:28:18 +01:00
|
|
|
genRule.GeneratedDeps()...)
|
2017-04-20 15:53:59 +02:00
|
|
|
// Add these re-exported flags to help header-abi-dumper to infer the abi exported by a library.
|
|
|
|
c.sabi.Properties.ReexportedIncludeFlags = append(c.sabi.Properties.ReexportedIncludeFlags, flags)
|
|
|
|
|
2016-09-29 02:34:58 +02:00
|
|
|
}
|
2016-04-20 23:21:14 +02:00
|
|
|
} else {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("module %q is not a genrule", depName)
|
2016-04-20 23:21:14 +02:00
|
|
|
}
|
2017-09-19 08:19:12 +02:00
|
|
|
case linkerScriptDepTag:
|
2017-09-28 02:01:44 +02:00
|
|
|
if genRule, ok := dep.(genrule.SourceFileGenerator); ok {
|
2017-09-19 08:19:12 +02:00
|
|
|
files := genRule.GeneratedSourceFiles()
|
|
|
|
if len(files) == 1 {
|
|
|
|
depPaths.LinkerScript = android.OptionalPathForPath(files[0])
|
|
|
|
} else if len(files) > 1 {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("module %q can only generate a single file if used for a linker script", depName)
|
2017-09-19 08:19:12 +02:00
|
|
|
}
|
|
|
|
} else {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("module %q is not a genrule", depName)
|
2017-09-19 08:19:12 +02:00
|
|
|
}
|
2016-04-20 23:21:14 +02:00
|
|
|
default:
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("depends on non-cc module %q", depName)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2016-04-12 00:06:20 +02:00
|
|
|
return
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
2017-10-24 02:59:01 +02:00
|
|
|
if dep.Target().Os != ctx.Os() {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("OS mismatch between %q and %q", ctx.ModuleName(), depName)
|
2016-06-02 02:09:44 +02:00
|
|
|
return
|
|
|
|
}
|
2017-10-24 02:59:01 +02:00
|
|
|
if dep.Target().Arch.ArchType != ctx.Arch().ArchType {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("Arch mismatch between %q and %q", ctx.ModuleName(), depName)
|
2016-04-12 00:06:20 +02:00
|
|
|
return
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2015-04-22 22:07:53 +02:00
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
// re-exporting flags
|
|
|
|
if depTag == reuseObjTag {
|
|
|
|
if l, ok := ccDep.compiler.(libraryInterface); ok {
|
2017-11-28 00:48:57 +01:00
|
|
|
c.staticVariant = ccDep
|
2017-05-04 01:24:55 +02:00
|
|
|
objs, flags, deps := l.reuseObjs()
|
2017-05-03 20:01:58 +02:00
|
|
|
depPaths.Objs = depPaths.Objs.Append(objs)
|
|
|
|
depPaths.ReexportedFlags = append(depPaths.ReexportedFlags, flags...)
|
2017-05-04 01:24:55 +02:00
|
|
|
depPaths.ReexportedFlagsDeps = append(depPaths.ReexportedFlagsDeps, deps...)
|
2016-11-24 00:45:05 +01:00
|
|
|
return
|
|
|
|
}
|
2016-04-12 00:06:20 +02:00
|
|
|
}
|
2017-09-28 02:01:44 +02:00
|
|
|
if t, ok := depTag.(dependencyTag); ok && t.library {
|
|
|
|
if i, ok := ccDep.linker.(exportedFlagsProducer); ok {
|
2016-07-09 09:14:08 +02:00
|
|
|
flags := i.exportedFlags()
|
2016-09-29 21:13:36 +02:00
|
|
|
deps := i.exportedFlagsDeps()
|
2016-07-09 09:14:08 +02:00
|
|
|
depPaths.Flags = append(depPaths.Flags, flags...)
|
2016-09-29 21:13:36 +02:00
|
|
|
depPaths.GeneratedHeaders = append(depPaths.GeneratedHeaders, deps...)
|
2016-06-07 03:22:19 +02:00
|
|
|
|
|
|
|
if t.reexportFlags {
|
2016-07-09 09:14:08 +02:00
|
|
|
depPaths.ReexportedFlags = append(depPaths.ReexportedFlags, flags...)
|
2016-09-29 21:13:36 +02:00
|
|
|
depPaths.ReexportedFlagsDeps = append(depPaths.ReexportedFlagsDeps, deps...)
|
2017-04-20 15:53:59 +02:00
|
|
|
// Add these re-exported flags to help header-abi-dumper to infer the abi exported by a library.
|
2017-08-24 01:08:29 +02:00
|
|
|
// Re-exported shared library headers must be included as well since they can help us with type information
|
|
|
|
// about template instantiations (instantiated from their headers).
|
|
|
|
c.sabi.Properties.ReexportedIncludeFlags = append(c.sabi.Properties.ReexportedIncludeFlags, flags...)
|
2016-06-07 03:22:19 +02:00
|
|
|
}
|
2016-04-12 00:06:20 +02:00
|
|
|
}
|
2016-06-07 21:34:45 +02:00
|
|
|
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
checkLinkType(ctx, c, ccDep, t)
|
2018-04-09 05:03:06 +02:00
|
|
|
checkDoubleLoadableLibries(ctx, c, ccDep)
|
2016-04-12 00:06:20 +02:00
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2016-10-01 02:10:16 +02:00
|
|
|
var ptr *android.Paths
|
2016-05-19 00:37:25 +02:00
|
|
|
var depPtr *android.Paths
|
2016-04-12 00:06:20 +02:00
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
linkFile := ccDep.outputFile
|
2016-10-01 02:10:16 +02:00
|
|
|
depFile := android.OptionalPath{}
|
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
switch depTag {
|
2016-06-18 01:45:24 +02:00
|
|
|
case ndkStubDepTag, sharedDepTag, sharedExportDepTag:
|
2016-10-01 02:10:16 +02:00
|
|
|
ptr = &depPaths.SharedLibs
|
|
|
|
depPtr = &depPaths.SharedLibsDeps
|
2017-09-28 02:01:44 +02:00
|
|
|
depFile = ccDep.linker.(libraryInterface).toc()
|
2017-11-28 00:48:57 +01:00
|
|
|
directSharedDeps = append(directSharedDeps, ccDep)
|
2016-06-18 01:45:24 +02:00
|
|
|
case lateSharedDepTag, ndkLateStubDepTag:
|
2016-10-01 02:10:16 +02:00
|
|
|
ptr = &depPaths.LateSharedLibs
|
|
|
|
depPtr = &depPaths.LateSharedLibsDeps
|
2017-09-28 02:01:44 +02:00
|
|
|
depFile = ccDep.linker.(libraryInterface).toc()
|
2016-06-07 03:22:19 +02:00
|
|
|
case staticDepTag, staticExportDepTag:
|
2017-09-28 02:05:30 +02:00
|
|
|
ptr = nil
|
|
|
|
directStaticDeps = append(directStaticDeps, ccDep)
|
2016-04-12 00:06:20 +02:00
|
|
|
case lateStaticDepTag:
|
2016-10-01 02:10:16 +02:00
|
|
|
ptr = &depPaths.LateStaticLibs
|
2016-04-12 00:06:20 +02:00
|
|
|
case wholeStaticDepTag:
|
2016-10-01 02:10:16 +02:00
|
|
|
ptr = &depPaths.WholeStaticLibs
|
2017-09-28 02:01:44 +02:00
|
|
|
staticLib, ok := ccDep.linker.(libraryInterface)
|
2016-07-30 02:28:03 +02:00
|
|
|
if !ok || !staticLib.static() {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("module %q not a static library", depName)
|
2016-04-12 00:06:20 +02:00
|
|
|
return
|
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2016-04-12 00:06:20 +02:00
|
|
|
if missingDeps := staticLib.getWholeStaticMissingDeps(); missingDeps != nil {
|
2017-09-28 02:01:44 +02:00
|
|
|
postfix := " (required by " + ctx.OtherModuleName(dep) + ")"
|
2016-04-12 00:06:20 +02:00
|
|
|
for i := range missingDeps {
|
|
|
|
missingDeps[i] += postfix
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2016-04-12 00:06:20 +02:00
|
|
|
ctx.AddMissingDependencies(missingDeps)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2016-09-27 02:33:01 +02:00
|
|
|
depPaths.WholeStaticLibObjs = depPaths.WholeStaticLibObjs.Append(staticLib.objs())
|
2016-12-13 21:50:57 +01:00
|
|
|
case headerDepTag:
|
|
|
|
// Nothing
|
2016-04-12 00:06:20 +02:00
|
|
|
case objDepTag:
|
2016-09-27 02:33:01 +02:00
|
|
|
depPaths.Objs.objFiles = append(depPaths.Objs.objFiles, linkFile.Path())
|
2016-04-12 00:06:20 +02:00
|
|
|
case crtBeginDepTag:
|
2016-10-01 02:10:16 +02:00
|
|
|
depPaths.CrtBegin = linkFile
|
2016-04-12 00:06:20 +02:00
|
|
|
case crtEndDepTag:
|
2016-10-01 02:10:16 +02:00
|
|
|
depPaths.CrtEnd = linkFile
|
2016-04-12 00:06:20 +02:00
|
|
|
}
|
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
switch depTag {
|
2017-02-10 01:16:31 +01:00
|
|
|
case staticDepTag, staticExportDepTag, lateStaticDepTag:
|
2017-09-28 02:01:44 +02:00
|
|
|
staticLib, ok := ccDep.linker.(libraryInterface)
|
2017-02-10 01:16:31 +01:00
|
|
|
if !ok || !staticLib.static() {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("module %q not a static library", depName)
|
2017-02-10 01:16:31 +01:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// When combining coverage files for shared libraries and executables, coverage files
|
2017-02-08 22:45:53 +01:00
|
|
|
// in static libraries act as if they were whole static libraries. The same goes for
|
|
|
|
// source based Abi dump files.
|
2017-02-10 01:16:31 +01:00
|
|
|
depPaths.StaticLibObjs.coverageFiles = append(depPaths.StaticLibObjs.coverageFiles,
|
|
|
|
staticLib.objs().coverageFiles...)
|
2017-02-08 22:45:53 +01:00
|
|
|
depPaths.StaticLibObjs.sAbiDumpFiles = append(depPaths.StaticLibObjs.sAbiDumpFiles,
|
|
|
|
staticLib.objs().sAbiDumpFiles...)
|
2017-09-28 02:01:44 +02:00
|
|
|
|
2017-02-10 01:16:31 +01:00
|
|
|
}
|
|
|
|
|
2016-10-01 02:10:16 +02:00
|
|
|
if ptr != nil {
|
2016-10-07 01:12:58 +02:00
|
|
|
if !linkFile.Valid() {
|
2017-09-28 02:01:44 +02:00
|
|
|
ctx.ModuleErrorf("module %q missing output file", depName)
|
2016-10-07 01:12:58 +02:00
|
|
|
return
|
|
|
|
}
|
2016-10-01 02:10:16 +02:00
|
|
|
*ptr = append(*ptr, linkFile.Path())
|
|
|
|
}
|
|
|
|
|
2016-04-12 00:06:20 +02:00
|
|
|
if depPtr != nil {
|
2016-10-01 02:10:16 +02:00
|
|
|
dep := depFile
|
|
|
|
if !dep.Valid() {
|
|
|
|
dep = linkFile
|
|
|
|
}
|
|
|
|
*depPtr = append(*depPtr, dep.Path())
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
2017-07-18 06:23:39 +02:00
|
|
|
|
2017-12-19 18:17:32 +01:00
|
|
|
makeLibName := func(depName string) string {
|
2017-09-28 02:01:44 +02:00
|
|
|
libName := strings.TrimSuffix(depName, llndkLibrarySuffix)
|
Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.
However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).
This change provides a way to make a vendor lib as public by defining a
module of type 'vendor_public_library' with a map file that enumerates
public symbols that are publicized:
cc_library {
name: "libvendor",
proprietary: true,
...
}
vendor_public_library {
name: "libvendor",
symbol_file: "libvendor.map.txt",
}
This defines a stub library module named libvendor.vendorpublic from the
map file. `shared_libs: ["libvendor"]` is redirected to the stub library
when it is from the outside of the vendor partition.
Bug: 74275385
Test: m -j
Test: cc_test.go passes
Change-Id: I5bed94d7c4282b777632ab2f0fb63c203ee313ba
2018-03-19 10:23:01 +01:00
|
|
|
libName = strings.TrimSuffix(libName, vendorPublicLibrarySuffix)
|
2017-07-18 06:23:39 +02:00
|
|
|
libName = strings.TrimPrefix(libName, "prebuilt_")
|
2017-08-03 14:22:50 +02:00
|
|
|
isLLndk := inList(libName, llndkLibraries)
|
Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.
However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).
This change provides a way to make a vendor lib as public by defining a
module of type 'vendor_public_library' with a map file that enumerates
public symbols that are publicized:
cc_library {
name: "libvendor",
proprietary: true,
...
}
vendor_public_library {
name: "libvendor",
symbol_file: "libvendor.map.txt",
}
This defines a stub library module named libvendor.vendorpublic from the
map file. `shared_libs: ["libvendor"]` is redirected to the stub library
when it is from the outside of the vendor partition.
Bug: 74275385
Test: m -j
Test: cc_test.go passes
Change-Id: I5bed94d7c4282b777632ab2f0fb63c203ee313ba
2018-03-19 10:23:01 +01:00
|
|
|
isVendorPublicLib := inList(libName, vendorPublicLibraries)
|
2017-09-28 02:01:44 +02:00
|
|
|
bothVendorAndCoreVariantsExist := ccDep.hasVendorVariant() || isLLndk
|
|
|
|
if c.useVndk() && bothVendorAndCoreVariantsExist {
|
|
|
|
// The vendor module in Make will have been renamed to not conflict with the core
|
|
|
|
// module, so update the dependency name here accordingly.
|
2017-12-19 18:17:32 +01:00
|
|
|
return libName + vendorSuffix
|
Allow platform modules to link to vendor public libraries
Normally, when building with VNDK, platform modules are not allowed to
link against vendor libraries, because the ABI of the vendor libraries
are not guaranteed to be stable and may differ across multiple vendor
images.
However, the vendor public libraries are the exceptions. Vendor public
libraries are vendor libraries that are exposed to 3rd party apps and
listed in /vendor/etc/public.libraries.txt. Since they are intended to
be exposed to public, their ABI stability is guaranteed (by definition,
though it is up to the vendor to actually guarantee it).
This change provides a way to make a vendor lib as public by defining a
module of type 'vendor_public_library' with a map file that enumerates
public symbols that are publicized:
cc_library {
name: "libvendor",
proprietary: true,
...
}
vendor_public_library {
name: "libvendor",
symbol_file: "libvendor.map.txt",
}
This defines a stub library module named libvendor.vendorpublic from the
map file. `shared_libs: ["libvendor"]` is redirected to the stub library
when it is from the outside of the vendor partition.
Bug: 74275385
Test: m -j
Test: cc_test.go passes
Change-Id: I5bed94d7c4282b777632ab2f0fb63c203ee313ba
2018-03-19 10:23:01 +01:00
|
|
|
} else if (ctx.Platform() || ctx.ProductSpecific()) && isVendorPublicLib {
|
2017-12-19 18:17:32 +01:00
|
|
|
return libName + vendorPublicLibrarySuffix
|
2018-01-31 16:54:12 +01:00
|
|
|
} else if ccDep.inRecovery() && !ccDep.onlyInRecovery() {
|
|
|
|
return libName + recoverySuffix
|
2017-09-28 02:01:44 +02:00
|
|
|
} else {
|
2017-12-19 18:17:32 +01:00
|
|
|
return libName
|
2017-07-18 06:23:39 +02:00
|
|
|
}
|
2017-12-19 18:17:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Export the shared libs to Make.
|
|
|
|
switch depTag {
|
|
|
|
case sharedDepTag, sharedExportDepTag, lateSharedDepTag:
|
2017-07-18 06:23:39 +02:00
|
|
|
// Note: the order of libs in this list is not important because
|
2017-09-28 02:01:44 +02:00
|
|
|
// they merely serve as Make dependencies and do not affect this lib itself.
|
2017-12-19 18:17:32 +01:00
|
|
|
c.Properties.AndroidMkSharedLibs = append(
|
|
|
|
c.Properties.AndroidMkSharedLibs, makeLibName(depName))
|
|
|
|
case runtimeDepTag:
|
|
|
|
c.Properties.AndroidMkRuntimeLibs = append(
|
|
|
|
c.Properties.AndroidMkRuntimeLibs, makeLibName(depName))
|
2017-07-18 06:23:39 +02:00
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
})
|
|
|
|
|
2017-09-28 02:05:30 +02:00
|
|
|
// use the ordered dependencies as this module's dependencies
|
2017-11-28 00:48:57 +01:00
|
|
|
depPaths.StaticLibs = append(depPaths.StaticLibs, orderStaticModuleDeps(c, directStaticDeps, directSharedDeps)...)
|
2017-09-28 02:05:30 +02:00
|
|
|
|
2017-05-17 22:44:16 +02:00
|
|
|
// Dedup exported flags from dependencies
|
2017-10-24 20:13:31 +02:00
|
|
|
depPaths.Flags = android.FirstUniqueStrings(depPaths.Flags)
|
2017-08-29 21:28:37 +02:00
|
|
|
depPaths.GeneratedHeaders = android.FirstUniquePaths(depPaths.GeneratedHeaders)
|
2017-10-24 20:13:31 +02:00
|
|
|
depPaths.ReexportedFlags = android.FirstUniqueStrings(depPaths.ReexportedFlags)
|
2017-08-29 21:28:37 +02:00
|
|
|
depPaths.ReexportedFlagsDeps = android.FirstUniquePaths(depPaths.ReexportedFlagsDeps)
|
|
|
|
|
|
|
|
if c.sabi != nil {
|
2017-10-24 20:13:31 +02:00
|
|
|
c.sabi.Properties.ReexportedIncludeFlags = android.FirstUniqueStrings(c.sabi.Properties.ReexportedIncludeFlags)
|
2017-08-29 21:28:37 +02:00
|
|
|
}
|
2017-05-17 22:44:16 +02:00
|
|
|
|
2016-01-04 23:34:37 +01:00
|
|
|
return depPaths
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Module) InstallInData() bool {
|
|
|
|
if c.installer == nil {
|
|
|
|
return false
|
|
|
|
}
|
2017-03-30 07:00:18 +02:00
|
|
|
return c.installer.inData()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Module) InstallInSanitizerDir() bool {
|
|
|
|
if c.installer == nil {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if c.sanitize != nil && c.sanitize.inSanitizerDir() {
|
2016-08-29 22:41:32 +02:00
|
|
|
return true
|
|
|
|
}
|
2017-03-30 07:00:18 +02:00
|
|
|
return c.installer.inSanitizerDir()
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
2018-01-31 16:54:12 +01:00
|
|
|
func (c *Module) InstallInRecovery() bool {
|
|
|
|
return c.inRecovery()
|
|
|
|
}
|
|
|
|
|
2016-09-29 01:18:03 +02:00
|
|
|
func (c *Module) HostToolPath() android.OptionalPath {
|
|
|
|
if c.installer == nil {
|
|
|
|
return android.OptionalPath{}
|
|
|
|
}
|
|
|
|
return c.installer.hostToolPath()
|
|
|
|
}
|
|
|
|
|
2017-07-12 21:55:28 +02:00
|
|
|
func (c *Module) IntermPathForModuleOut() android.OptionalPath {
|
|
|
|
return c.outputFile
|
|
|
|
}
|
|
|
|
|
2017-09-14 03:37:08 +02:00
|
|
|
func (c *Module) Srcs() android.Paths {
|
|
|
|
if c.outputFile.Valid() {
|
|
|
|
return android.Paths{c.outputFile.Path()}
|
|
|
|
}
|
|
|
|
return android.Paths{}
|
|
|
|
}
|
|
|
|
|
2017-11-01 10:20:21 +01:00
|
|
|
func (c *Module) static() bool {
|
|
|
|
if static, ok := c.linker.(interface {
|
|
|
|
static() bool
|
|
|
|
}); ok {
|
|
|
|
return static.static()
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2016-07-29 21:48:20 +02:00
|
|
|
//
|
|
|
|
// Defaults
|
|
|
|
//
|
|
|
|
type Defaults struct {
|
|
|
|
android.ModuleBase
|
2017-07-07 23:33:33 +02:00
|
|
|
android.DefaultsModuleBase
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
2016-07-29 21:48:20 +02:00
|
|
|
func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
2016-04-20 23:21:14 +02:00
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2016-10-12 23:38:15 +02:00
|
|
|
func (d *Defaults) DepsMutator(ctx android.BottomUpMutatorContext) {
|
|
|
|
}
|
|
|
|
|
2017-06-24 00:06:31 +02:00
|
|
|
func defaultsFactory() android.Module {
|
2016-08-18 23:18:32 +02:00
|
|
|
return DefaultsFactory()
|
|
|
|
}
|
|
|
|
|
2017-06-24 00:06:31 +02:00
|
|
|
func DefaultsFactory(props ...interface{}) android.Module {
|
2016-07-29 21:48:20 +02:00
|
|
|
module := &Defaults{}
|
2015-01-31 02:27:36 +01:00
|
|
|
|
2017-06-24 00:06:31 +02:00
|
|
|
module.AddProperties(props...)
|
|
|
|
module.AddProperties(
|
2016-07-29 21:48:20 +02:00
|
|
|
&BaseProperties{},
|
2017-09-14 03:37:08 +02:00
|
|
|
&VendorProperties{},
|
2016-07-29 21:48:20 +02:00
|
|
|
&BaseCompilerProperties{},
|
|
|
|
&BaseLinkerProperties{},
|
2016-07-30 02:28:03 +02:00
|
|
|
&LibraryProperties{},
|
2016-07-29 21:48:20 +02:00
|
|
|
&FlagExporterProperties{},
|
|
|
|
&BinaryLinkerProperties{},
|
2016-07-30 02:28:03 +02:00
|
|
|
&TestProperties{},
|
|
|
|
&TestBinaryProperties{},
|
2016-07-29 21:48:20 +02:00
|
|
|
&StlProperties{},
|
|
|
|
&SanitizeProperties{},
|
|
|
|
&StripProperties{},
|
2016-09-01 22:45:39 +02:00
|
|
|
&InstallerProperties{},
|
2016-09-27 00:45:04 +02:00
|
|
|
&TidyProperties{},
|
2017-02-10 01:16:31 +01:00
|
|
|
&CoverageProperties{},
|
2017-02-08 22:45:53 +01:00
|
|
|
&SAbiProperties{},
|
2017-07-26 07:22:10 +02:00
|
|
|
&VndkProperties{},
|
2017-05-10 00:44:35 +02:00
|
|
|
<OProperties{},
|
2017-09-01 08:38:27 +02:00
|
|
|
&PgoProperties{},
|
2018-03-08 22:27:59 +01:00
|
|
|
&android.ProtoProperties{},
|
2016-08-18 23:18:32 +02:00
|
|
|
)
|
2016-04-20 23:21:14 +02:00
|
|
|
|
2017-07-07 23:33:33 +02:00
|
|
|
android.InitDefaultsModule(module)
|
2017-06-24 00:06:31 +02:00
|
|
|
|
|
|
|
return module
|
2015-01-31 02:27:36 +01:00
|
|
|
}
|
|
|
|
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
const (
|
|
|
|
// coreMode is the variant used for framework-private libraries, or
|
|
|
|
// SDK libraries. (which framework-private libraries can use)
|
|
|
|
coreMode = "core"
|
|
|
|
|
|
|
|
// vendorMode is the variant used for /vendor code that compiles
|
|
|
|
// against the VNDK.
|
|
|
|
vendorMode = "vendor"
|
2018-01-31 16:54:12 +01:00
|
|
|
|
|
|
|
recoveryMode = "recovery"
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
)
|
|
|
|
|
Squash vendor sources before linkageMutator runs
linkageMutator removes srcs property of the shared variant of a lib in
order to reuse *.o files compiled for the static variant also to the
shared variant.
However, this causes problem when vendor-specific srcs are specified in
target: {vendor: {srcs: ["..."]}}. For example, let's assume
cc_library {
name: "libfoo",
srcs: ["foo.c"],
target: {
vendor: {
srcs: ["bar.c"],
},
},
}
Then,
static_vendor: inputs = foo.o, bar.o
shared_vendor: inputs = foo.o (from static_vendor), bar.o (from
static_vendor), bar.o
So, bar.o is included twice and this causes multiple symbol definition
error.
In order to handle the problem, vendor mutator is applied before the
linkage mutator and the vendor-specific srcs are squashed in the vendor
mutator.
Bug: 67731122
Test: build
Test: cc_test.go
Change-Id: I2a5390295dddfc41260e9b6f02746908cdf47228
2017-10-12 16:05:00 +02:00
|
|
|
func squashVendorSrcs(m *Module) {
|
|
|
|
if lib, ok := m.compiler.(*libraryDecorator); ok {
|
|
|
|
lib.baseCompiler.Properties.Srcs = append(lib.baseCompiler.Properties.Srcs,
|
|
|
|
lib.baseCompiler.Properties.Target.Vendor.Srcs...)
|
|
|
|
|
|
|
|
lib.baseCompiler.Properties.Exclude_srcs = append(lib.baseCompiler.Properties.Exclude_srcs,
|
|
|
|
lib.baseCompiler.Properties.Target.Vendor.Exclude_srcs...)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-01-31 16:54:12 +01:00
|
|
|
func squashRecoverySrcs(m *Module) {
|
|
|
|
if lib, ok := m.compiler.(*libraryDecorator); ok {
|
|
|
|
lib.baseCompiler.Properties.Srcs = append(lib.baseCompiler.Properties.Srcs,
|
|
|
|
lib.baseCompiler.Properties.Target.Recovery.Srcs...)
|
|
|
|
|
|
|
|
lib.baseCompiler.Properties.Exclude_srcs = append(lib.baseCompiler.Properties.Exclude_srcs,
|
|
|
|
lib.baseCompiler.Properties.Target.Recovery.Exclude_srcs...)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func imageMutator(mctx android.BottomUpMutatorContext) {
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
if mctx.Os() != android.Android {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2017-09-14 03:37:08 +02:00
|
|
|
if genrule, ok := mctx.Module().(*genrule.Module); ok {
|
2018-05-24 06:36:56 +02:00
|
|
|
if props, ok := genrule.Extra.(*GenruleExtraProperties); ok {
|
|
|
|
var coreVariantNeeded bool = false
|
|
|
|
var vendorVariantNeeded bool = false
|
|
|
|
var recoveryVariantNeeded bool = false
|
Install VNDK snapshot libraries for system build
When BOARD_VNDK_VERSION := <VNDK version>, or
PRODUCT_EXTRA_VNDK_VERSIONS includes the needed <VNDK version> list,
the prebuilt VNDK libs in prebuilts/vndk/ directory will be
installed.
Each prebuilt VNDK module uses "vndk_prebuilt_shared" for shared
VNDK/VNDK-SP libs.
Following is the sample configuration of a vndk snapshot module:
vndk_prebuilt_shared {
name: "libfoo",
version: "27",
vendor_available: true,
vndk: {
enabled: true,
},
arch: {
arm64: {
srcs: ["arm/lib64/libfoo.so"],
},
arm: {
srcs: ["arm/lib/libfoo.so"],
},
},
}
The Android.bp for the snapshot modules will be auto-generated by a
script.
Bug: 38304393
Bug: 65377115
Bug: 68123344
Test: set BOARD_VNDK_VERSION := 27
copy a snapshot for v27
build with make command
Change-Id: Ib93107530dbabb4a24583f4d6e4f0c513c9adfec
2017-11-17 04:10:28 +01:00
|
|
|
if mctx.DeviceConfig().VndkVersion() == "" {
|
2018-05-24 06:36:56 +02:00
|
|
|
coreVariantNeeded = true
|
2017-09-14 03:37:08 +02:00
|
|
|
} else if Bool(props.Vendor_available) {
|
2018-05-24 06:36:56 +02:00
|
|
|
coreVariantNeeded = true
|
|
|
|
vendorVariantNeeded = true
|
2017-11-08 08:03:48 +01:00
|
|
|
} else if mctx.SocSpecific() || mctx.DeviceSpecific() {
|
2018-05-24 06:36:56 +02:00
|
|
|
vendorVariantNeeded = true
|
2017-09-14 03:37:08 +02:00
|
|
|
} else {
|
2018-05-24 06:36:56 +02:00
|
|
|
coreVariantNeeded = true
|
2017-09-14 03:37:08 +02:00
|
|
|
}
|
2018-05-24 06:36:56 +02:00
|
|
|
if Bool(props.Recovery_available) {
|
|
|
|
recoveryVariantNeeded = true
|
|
|
|
}
|
|
|
|
|
|
|
|
var variants []string
|
|
|
|
if coreVariantNeeded {
|
|
|
|
variants = append(variants, coreMode)
|
|
|
|
}
|
|
|
|
if vendorVariantNeeded {
|
|
|
|
variants = append(variants, vendorMode)
|
|
|
|
}
|
|
|
|
if recoveryVariantNeeded {
|
|
|
|
variants = append(variants, recoveryMode)
|
|
|
|
}
|
|
|
|
mctx.CreateVariations(variants...)
|
2017-09-14 03:37:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
m, ok := mctx.Module().(*Module)
|
|
|
|
if !ok {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sanity check
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vendorSpecific := mctx.SocSpecific() || mctx.DeviceSpecific()
|
|
|
|
|
|
|
|
if m.VendorProperties.Vendor_available != nil && vendorSpecific {
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
mctx.PropertyErrorf("vendor_available",
|
2017-11-08 08:03:48 +01:00
|
|
|
"doesn't make sense at the same time as `vendor: true`, `proprietary: true`, or `device_specific:true`")
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
return
|
|
|
|
}
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
|
|
|
|
if vndkdep := m.vndkdep; vndkdep != nil {
|
|
|
|
if vndkdep.isVndk() {
|
|
|
|
if vendorSpecific {
|
|
|
|
if !vndkdep.isVndkExt() {
|
|
|
|
mctx.PropertyErrorf("vndk",
|
|
|
|
"must set `extends: \"...\"` to vndk extension")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if vndkdep.isVndkExt() {
|
|
|
|
mctx.PropertyErrorf("vndk",
|
|
|
|
"must set `vendor: true` to set `extends: %q`",
|
|
|
|
m.getVndkExtendsModuleName())
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if m.VendorProperties.Vendor_available == nil {
|
|
|
|
mctx.PropertyErrorf("vndk",
|
|
|
|
"vendor_available must be set to either true or false when `vndk: {enabled: true}`")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if vndkdep.isVndkSp() {
|
|
|
|
mctx.PropertyErrorf("vndk",
|
|
|
|
"must set `enabled: true` to set `support_system_process: true`")
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vndkdep.isVndkExt() {
|
|
|
|
mctx.PropertyErrorf("vndk",
|
|
|
|
"must set `enabled: true` to set `extends: %q`",
|
|
|
|
m.getVndkExtendsModuleName())
|
|
|
|
return
|
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
}
|
|
|
|
}
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
|
2018-01-31 16:54:12 +01:00
|
|
|
var coreVariantNeeded bool = false
|
|
|
|
var vendorVariantNeeded bool = false
|
|
|
|
var recoveryVariantNeeded bool = false
|
|
|
|
|
Install VNDK snapshot libraries for system build
When BOARD_VNDK_VERSION := <VNDK version>, or
PRODUCT_EXTRA_VNDK_VERSIONS includes the needed <VNDK version> list,
the prebuilt VNDK libs in prebuilts/vndk/ directory will be
installed.
Each prebuilt VNDK module uses "vndk_prebuilt_shared" for shared
VNDK/VNDK-SP libs.
Following is the sample configuration of a vndk snapshot module:
vndk_prebuilt_shared {
name: "libfoo",
version: "27",
vendor_available: true,
vndk: {
enabled: true,
},
arch: {
arm64: {
srcs: ["arm/lib64/libfoo.so"],
},
arm: {
srcs: ["arm/lib/libfoo.so"],
},
},
}
The Android.bp for the snapshot modules will be auto-generated by a
script.
Bug: 38304393
Bug: 65377115
Bug: 68123344
Test: set BOARD_VNDK_VERSION := 27
copy a snapshot for v27
build with make command
Change-Id: Ib93107530dbabb4a24583f4d6e4f0c513c9adfec
2017-11-17 04:10:28 +01:00
|
|
|
if mctx.DeviceConfig().VndkVersion() == "" {
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
// If the device isn't compiling against the VNDK, we always
|
|
|
|
// use the core mode.
|
2018-01-31 16:54:12 +01:00
|
|
|
coreVariantNeeded = true
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
} else if _, ok := m.linker.(*llndkStubDecorator); ok {
|
|
|
|
// LL-NDK stubs only exist in the vendor variant, since the
|
|
|
|
// real libraries will be used in the core variant.
|
2018-01-31 16:54:12 +01:00
|
|
|
vendorVariantNeeded = true
|
2017-10-19 08:59:33 +02:00
|
|
|
} else if _, ok := m.linker.(*llndkHeadersDecorator); ok {
|
|
|
|
// ... and LL-NDK headers as well
|
2018-01-31 16:54:12 +01:00
|
|
|
vendorVariantNeeded = true
|
2018-01-23 04:07:46 +01:00
|
|
|
} else if _, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok {
|
Install VNDK snapshot libraries for system build
When BOARD_VNDK_VERSION := <VNDK version>, or
PRODUCT_EXTRA_VNDK_VERSIONS includes the needed <VNDK version> list,
the prebuilt VNDK libs in prebuilts/vndk/ directory will be
installed.
Each prebuilt VNDK module uses "vndk_prebuilt_shared" for shared
VNDK/VNDK-SP libs.
Following is the sample configuration of a vndk snapshot module:
vndk_prebuilt_shared {
name: "libfoo",
version: "27",
vendor_available: true,
vndk: {
enabled: true,
},
arch: {
arm64: {
srcs: ["arm/lib64/libfoo.so"],
},
arm: {
srcs: ["arm/lib/libfoo.so"],
},
},
}
The Android.bp for the snapshot modules will be auto-generated by a
script.
Bug: 38304393
Bug: 65377115
Bug: 68123344
Test: set BOARD_VNDK_VERSION := 27
copy a snapshot for v27
build with make command
Change-Id: Ib93107530dbabb4a24583f4d6e4f0c513c9adfec
2017-11-17 04:10:28 +01:00
|
|
|
// Make vendor variants only for the versions in BOARD_VNDK_VERSION and
|
|
|
|
// PRODUCT_EXTRA_VNDK_VERSIONS.
|
2018-01-31 16:54:12 +01:00
|
|
|
vendorVariantNeeded = true
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
} else if m.hasVendorVariant() && !vendorSpecific {
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
// This will be available in both /system and /vendor
|
2017-06-23 12:24:43 +02:00
|
|
|
// or a /system directory that is available to vendor.
|
2018-01-31 16:54:12 +01:00
|
|
|
coreVariantNeeded = true
|
|
|
|
vendorVariantNeeded = true
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
} else if vendorSpecific && String(m.Properties.Sdk_version) == "" {
|
2017-11-08 08:03:48 +01:00
|
|
|
// This will be available in /vendor (or /odm) only
|
2018-01-31 16:54:12 +01:00
|
|
|
vendorVariantNeeded = true
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
} else {
|
|
|
|
// This is either in /system (or similar: /data), or is a
|
|
|
|
// modules built with the NDK. Modules built with the NDK
|
|
|
|
// will be restricted using the existing link type checks.
|
2018-01-31 16:54:12 +01:00
|
|
|
coreVariantNeeded = true
|
|
|
|
}
|
|
|
|
|
|
|
|
if Bool(m.Properties.Recovery_available) {
|
|
|
|
recoveryVariantNeeded = true
|
|
|
|
}
|
|
|
|
|
|
|
|
if m.ModuleBase.InstallInRecovery() {
|
|
|
|
recoveryVariantNeeded = true
|
|
|
|
coreVariantNeeded = false
|
|
|
|
}
|
|
|
|
|
|
|
|
var variants []string
|
|
|
|
if coreVariantNeeded {
|
|
|
|
variants = append(variants, coreMode)
|
|
|
|
}
|
|
|
|
if vendorVariantNeeded {
|
|
|
|
variants = append(variants, vendorMode)
|
|
|
|
}
|
|
|
|
if recoveryVariantNeeded {
|
|
|
|
variants = append(variants, recoveryMode)
|
|
|
|
}
|
|
|
|
mod := mctx.CreateVariations(variants...)
|
|
|
|
for i, v := range variants {
|
|
|
|
if v == vendorMode {
|
|
|
|
m := mod[i].(*Module)
|
|
|
|
m.Properties.UseVndk = true
|
|
|
|
squashVendorSrcs(m)
|
|
|
|
} else if v == recoveryMode {
|
|
|
|
m := mod[i].(*Module)
|
|
|
|
m.Properties.InRecovery = true
|
|
|
|
squashRecoverySrcs(m)
|
|
|
|
}
|
Split /system and /vendor modules, allow multi-installation
Nothing changes if BOARD_VNDK_VERSION isn't set.
When the VNDK is enabled (BOARD_VNDK_VERSION in Make), this will split
/system and /vendor modules into two different variant spaces that can't
link to each other. There are a few interfaces between the two variant
spaces:
The `llndk_library` stubs will be available in the /vendor variant, but
won't be installed, so at runtime the /system variant will be used.
Setting `vendor_available: true` will split a module into both variants.
The /system (or "core") variant will compile just like today. The
/vendor ("vendor") variant will compile against everything else in the
vendor space (so LL-NDK instead of libc/liblog/etc). There will be two
copies of these libraries installed onto the final device.
Since the available runtime interfaces for vendor modules may be
reduced, and your dependencies may not expose their private interfaces,
we allow the vendor variants to reduce their compilation set, and export
a different set of headers:
cc_library {
name: "libfoo",
srcs: ["common.cpp", "private_impl.cpp"],
export_include_dirs: ["include"],
target: {
vendor: {
export_include_dirs: ["include_vndk"],
exclude_srcs: ["private_impl.cpp"],
srcs: ["vendor_only.cpp"],
},
},
}
So the "core" variant would compile with both "common.cpp" and
"private_impl.cpp", and export "include".
The "vendor" variant would compile "common.cpp" and "vendor_only.cpp",
and export "include_vndk".
Bug: 36426473
Bug: 36079834
Test: out/soong/build.ninja, out/soong/Android- only changes due to _core addition and
.llndk -> .vendor
Test: attempt to compile with BOARD_VNDK_VERSION:=current
Change-Id: Idef28764043bf6c33dc0d2e7e2026c38867ff769
2017-04-06 21:43:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-09 19:21:52 +02:00
|
|
|
func getCurrentNdkPrebuiltVersion(ctx DepsContext) string {
|
2017-11-29 09:27:14 +01:00
|
|
|
if ctx.Config().PlatformSdkVersionInt() > config.NdkMaxPrebuiltVersionInt {
|
2017-05-09 19:21:52 +02:00
|
|
|
return strconv.Itoa(config.NdkMaxPrebuiltVersionInt)
|
|
|
|
}
|
2017-11-29 09:27:14 +01:00
|
|
|
return ctx.Config().PlatformSdkVersion()
|
2017-05-09 19:21:52 +02:00
|
|
|
}
|
|
|
|
|
2015-10-29 01:23:31 +01:00
|
|
|
var Bool = proptools.Bool
|
2018-04-11 01:14:46 +02:00
|
|
|
var BoolDefault = proptools.BoolDefault
|
2017-11-07 19:57:05 +01:00
|
|
|
var BoolPtr = proptools.BoolPtr
|
|
|
|
var String = proptools.String
|
|
|
|
var StringPtr = proptools.StringPtr
|