2015-07-09 03:13:11 +02:00
|
|
|
// Copyright 2015 Google Inc. All rights reserved.
|
|
|
|
//
|
|
|
|
// 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
|
|
|
|
|
|
|
|
import (
|
2016-02-10 02:43:51 +01:00
|
|
|
"fmt"
|
2015-07-09 03:13:11 +02:00
|
|
|
"io"
|
2016-03-24 21:14:12 +01:00
|
|
|
"path/filepath"
|
2015-07-09 03:13:11 +02:00
|
|
|
"strings"
|
|
|
|
|
2016-05-19 00:37:25 +02:00
|
|
|
"android/soong/android"
|
2015-07-09 03:13:11 +02:00
|
|
|
)
|
|
|
|
|
2017-07-18 06:23:39 +02:00
|
|
|
var (
|
2018-01-31 16:54:12 +01:00
|
|
|
vendorSuffix = ".vendor"
|
|
|
|
recoverySuffix = ".recovery"
|
2017-07-18 06:23:39 +02:00
|
|
|
)
|
|
|
|
|
2016-07-14 01:50:22 +02:00
|
|
|
type AndroidMkContext interface {
|
|
|
|
Target() android.Target
|
2016-07-30 02:28:03 +02:00
|
|
|
subAndroidMk(*android.AndroidMkData, interface{})
|
2017-09-28 02:01:44 +02:00
|
|
|
useVndk() bool
|
2016-07-30 02:28:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
type subAndroidMkProvider interface {
|
|
|
|
AndroidMk(AndroidMkContext, *android.AndroidMkData)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (c *Module) subAndroidMk(data *android.AndroidMkData, obj interface{}) {
|
|
|
|
if c.subAndroidMkOnce == nil {
|
|
|
|
c.subAndroidMkOnce = make(map[subAndroidMkProvider]bool)
|
|
|
|
}
|
|
|
|
if androidmk, ok := obj.(subAndroidMkProvider); ok {
|
|
|
|
if !c.subAndroidMkOnce[androidmk] {
|
|
|
|
c.subAndroidMkOnce[androidmk] = true
|
|
|
|
androidmk.AndroidMk(c, data)
|
|
|
|
}
|
|
|
|
}
|
2016-07-14 01:50:22 +02:00
|
|
|
}
|
|
|
|
|
2017-08-11 02:00:19 +02:00
|
|
|
func (c *Module) AndroidMk() android.AndroidMkData {
|
2016-05-25 00:39:04 +02:00
|
|
|
if c.Properties.HideFromMake {
|
2017-08-11 02:00:19 +02:00
|
|
|
return android.AndroidMkData{
|
|
|
|
Disabled: true,
|
|
|
|
}
|
2016-05-25 00:39:04 +02:00
|
|
|
}
|
|
|
|
|
2017-08-11 02:00:19 +02:00
|
|
|
ret := android.AndroidMkData{
|
|
|
|
OutputFile: c.outputFile,
|
2017-12-19 18:17:32 +01:00
|
|
|
Required: c.Properties.AndroidMkRuntimeLibs,
|
|
|
|
|
2017-08-11 02:00:19 +02:00
|
|
|
Extra: []android.AndroidMkExtraFunc{
|
|
|
|
func(w io.Writer, outputFile android.Path) {
|
2017-12-08 00:28:59 +01:00
|
|
|
if len(c.Properties.Logtags) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_LOGTAGS_FILES :=", strings.Join(c.Properties.Logtags, " "))
|
|
|
|
}
|
2017-08-11 02:00:19 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_SANITIZE := never")
|
|
|
|
if len(c.Properties.AndroidMkSharedLibs) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_SHARED_LIBRARIES := "+strings.Join(c.Properties.AndroidMkSharedLibs, " "))
|
|
|
|
}
|
2017-11-07 19:57:05 +01:00
|
|
|
if c.Target().Os == android.Android &&
|
2018-05-30 02:59:23 +02:00
|
|
|
String(c.Properties.Sdk_version) != "" && !c.useVndk() && !c.inRecovery() {
|
2017-11-07 19:57:05 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_SDK_VERSION := "+String(c.Properties.Sdk_version))
|
2017-08-11 02:00:19 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_NDK_STL_VARIANT := none")
|
|
|
|
} else {
|
|
|
|
// These are already included in LOCAL_SHARED_LIBRARIES
|
|
|
|
fmt.Fprintln(w, "LOCAL_CXX_STL := none")
|
|
|
|
}
|
2017-09-28 02:01:44 +02:00
|
|
|
if c.useVndk() {
|
2017-08-11 02:00:19 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_USE_VNDK := true")
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
|
|
|
|
for _, feature := range c.features {
|
2016-07-30 02:28:03 +02:00
|
|
|
c.subAndroidMk(&ret, feature)
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
2016-07-30 02:28:03 +02:00
|
|
|
c.subAndroidMk(&ret, c.compiler)
|
|
|
|
c.subAndroidMk(&ret, c.linker)
|
2017-05-08 22:44:11 +02:00
|
|
|
if c.sanitize != nil {
|
|
|
|
c.subAndroidMk(&ret, c.sanitize)
|
|
|
|
}
|
2016-07-30 02:28:03 +02:00
|
|
|
c.subAndroidMk(&ret, c.installer)
|
2016-01-04 23:34:37 +01:00
|
|
|
|
2017-09-28 02:01:44 +02:00
|
|
|
if c.useVndk() && c.hasVendorVariant() {
|
2017-07-18 06:23:39 +02:00
|
|
|
// .vendor suffix is added only when we will have two variants: core and vendor.
|
|
|
|
// The suffix is not added for vendor-only module.
|
|
|
|
ret.SubName += vendorSuffix
|
2018-01-31 16:54:12 +01:00
|
|
|
} else if c.inRecovery() && !c.onlyInRecovery() {
|
|
|
|
ret.SubName += recoverySuffix
|
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-08-11 02:00:19 +02:00
|
|
|
return ret
|
2016-01-04 23:34:37 +01:00
|
|
|
}
|
|
|
|
|
2017-07-15 00:20:13 +02:00
|
|
|
func androidMkWriteTestData(data android.Paths, ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
var testFiles []string
|
|
|
|
for _, d := range data {
|
|
|
|
rel := d.Rel()
|
|
|
|
path := d.String()
|
|
|
|
if !strings.HasSuffix(path, rel) {
|
|
|
|
panic(fmt.Errorf("path %q does not end with %q", path, rel))
|
|
|
|
}
|
|
|
|
path = strings.TrimSuffix(path, rel)
|
|
|
|
testFiles = append(testFiles, path+":"+rel)
|
|
|
|
}
|
|
|
|
if len(testFiles) > 0 {
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2017-07-15 00:20:13 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_TEST_DATA := "+strings.Join(testFiles, " "))
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-19 21:44:32 +01:00
|
|
|
func (library *libraryDecorator) androidMkWriteExportedFlags(w io.Writer) {
|
|
|
|
exportedFlags := library.exportedFlags()
|
|
|
|
if len(exportedFlags) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_EXPORT_CFLAGS :=", strings.Join(exportedFlags, " "))
|
|
|
|
}
|
|
|
|
exportedFlagsDeps := library.exportedFlagsDeps()
|
|
|
|
if len(exportedFlagsDeps) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_EXPORT_C_INCLUDE_DEPS :=", strings.Join(exportedFlagsDeps.Strings(), " "))
|
2017-02-16 01:15:21 +01:00
|
|
|
}
|
2017-03-19 21:44:32 +01:00
|
|
|
}
|
2017-02-16 01:15:21 +01:00
|
|
|
|
2017-03-19 21:44:32 +01:00
|
|
|
func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
2017-02-16 01:15:21 +01:00
|
|
|
if library.static() {
|
|
|
|
ret.Class = "STATIC_LIBRARIES"
|
|
|
|
} else if library.shared() {
|
|
|
|
ctx.subAndroidMk(ret, &library.stripper)
|
|
|
|
ctx.subAndroidMk(ret, &library.relocationPacker)
|
|
|
|
|
|
|
|
ret.Class = "SHARED_LIBRARIES"
|
|
|
|
} else if library.header() {
|
2017-08-11 02:07:28 +02:00
|
|
|
ret.Custom = func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
|
2017-02-16 01:15:21 +01:00
|
|
|
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
|
|
|
|
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
|
2017-08-11 02:07:28 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE :=", name+data.SubName)
|
2017-02-16 01:15:21 +01:00
|
|
|
|
|
|
|
archStr := ctx.Target().Arch.ArchType.String()
|
|
|
|
var host bool
|
|
|
|
switch ctx.Target().Os.Class {
|
|
|
|
case android.Host:
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_HOST_ARCH := ", archStr)
|
|
|
|
host = true
|
|
|
|
case android.HostCross:
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_HOST_CROSS_ARCH := ", archStr)
|
|
|
|
host = true
|
|
|
|
case android.Device:
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_TARGET_ARCH := ", archStr)
|
|
|
|
}
|
|
|
|
|
|
|
|
if host {
|
2017-09-22 21:28:24 +02:00
|
|
|
makeOs := ctx.Target().Os.String()
|
|
|
|
if ctx.Target().Os == android.Linux || ctx.Target().Os == android.LinuxBionic {
|
|
|
|
makeOs = "linux"
|
|
|
|
}
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_HOST_OS :=", makeOs)
|
2017-02-16 01:15:21 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_IS_HOST_MODULE := true")
|
2017-09-28 02:01:44 +02:00
|
|
|
} else if ctx.useVndk() {
|
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
|
|
|
fmt.Fprintln(w, "LOCAL_USE_VNDK := true")
|
2017-02-16 01:15:21 +01:00
|
|
|
}
|
|
|
|
|
2017-03-19 21:44:32 +01:00
|
|
|
library.androidMkWriteExportedFlags(w)
|
2017-02-16 01:15:21 +01:00
|
|
|
fmt.Fprintln(w, "include $(BUILD_HEADER_LIBRARY)")
|
|
|
|
}
|
|
|
|
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2017-03-19 21:44:32 +01:00
|
|
|
library.androidMkWriteExportedFlags(w)
|
2017-02-08 22:45:53 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES := ")
|
|
|
|
if library.sAbiOutputFile.Valid() {
|
|
|
|
fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES += ", library.sAbiOutputFile.String())
|
|
|
|
if library.sAbiDiff.Valid() && !library.static() {
|
|
|
|
fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES += ", library.sAbiDiff.String())
|
2017-04-20 15:53:59 +02:00
|
|
|
fmt.Fprintln(w, "HEADER_ABI_DIFFS += ", library.sAbiDiff.String())
|
2017-02-08 22:45:53 +01:00
|
|
|
}
|
|
|
|
}
|
2015-07-09 03:13:11 +02:00
|
|
|
|
2016-08-30 00:53:15 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)"+outputFile.Ext())
|
2015-07-09 03:13:11 +02:00
|
|
|
|
2016-02-10 02:43:51 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")
|
2015-07-09 03:13:11 +02:00
|
|
|
|
2017-02-10 01:16:31 +01:00
|
|
|
if library.coverageOutputFile.Valid() {
|
|
|
|
fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", library.coverageOutputFile.String())
|
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
})
|
2016-07-30 02:28:03 +02:00
|
|
|
|
2017-02-15 23:06:12 +01:00
|
|
|
if library.shared() {
|
2016-07-30 02:28:03 +02:00
|
|
|
ctx.subAndroidMk(ret, library.baseInstaller)
|
|
|
|
}
|
2015-07-09 03:13:11 +02:00
|
|
|
}
|
|
|
|
|
2016-07-14 01:50:22 +02:00
|
|
|
func (object *objectLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
2017-08-11 02:07:28 +02:00
|
|
|
ret.Custom = func(w io.Writer, name, prefix, moduleDir string, data android.AndroidMkData) {
|
2016-01-04 23:34:37 +01:00
|
|
|
out := ret.OutputFile.Path()
|
2015-07-09 03:13:11 +02:00
|
|
|
|
2017-08-11 02:07:28 +02:00
|
|
|
fmt.Fprintln(w, "\n$("+prefix+"OUT_INTERMEDIATE_LIBRARIES)/"+name+data.SubName+objectExtension+":", out.String())
|
2016-02-10 02:43:51 +01:00
|
|
|
fmt.Fprintln(w, "\t$(copy-file-to-target)")
|
2015-07-09 03:13:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-30 02:28:03 +02:00
|
|
|
func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
2016-08-25 00:25:47 +02:00
|
|
|
ctx.subAndroidMk(ret, binary.baseInstaller)
|
2016-07-30 02:28:03 +02:00
|
|
|
ctx.subAndroidMk(ret, &binary.stripper)
|
2016-06-11 02:20:30 +02:00
|
|
|
|
2015-07-09 03:13:11 +02:00
|
|
|
ret.Class = "EXECUTABLES"
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2016-02-10 02:43:51 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")
|
2016-07-30 02:28:03 +02:00
|
|
|
if Bool(binary.Properties.Static_executable) {
|
2016-01-11 21:49:11 +01:00
|
|
|
fmt.Fprintln(w, "LOCAL_FORCE_STATIC_EXECUTABLE := true")
|
|
|
|
}
|
2016-12-07 22:37:42 +01:00
|
|
|
|
|
|
|
if len(binary.symlinks) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_SYMLINKS := "+strings.Join(binary.symlinks, " "))
|
|
|
|
}
|
|
|
|
|
2017-02-10 01:16:31 +01:00
|
|
|
if binary.coverageOutputFile.Valid() {
|
|
|
|
fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", binary.coverageOutputFile.String())
|
|
|
|
}
|
2018-04-03 22:22:50 +02:00
|
|
|
|
|
|
|
if len(binary.Properties.Overrides) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_OVERRIDES_MODULES := "+strings.Join(binary.Properties.Overrides, " "))
|
|
|
|
}
|
2016-01-04 23:34:37 +01:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2016-07-30 02:28:03 +02:00
|
|
|
func (benchmark *benchmarkDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
ctx.subAndroidMk(ret, benchmark.binaryDecorator)
|
2017-05-24 00:10:37 +02:00
|
|
|
ret.Class = "NATIVE_TESTS"
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2017-04-25 03:10:29 +02:00
|
|
|
if len(benchmark.Properties.Test_suites) > 0 {
|
|
|
|
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",
|
|
|
|
strings.Join(benchmark.Properties.Test_suites, " "))
|
|
|
|
}
|
2018-08-03 00:00:46 +02:00
|
|
|
if benchmark.Properties.Test_config != nil {
|
|
|
|
fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",
|
|
|
|
benchmark.Properties.Test_config)
|
|
|
|
}
|
2018-04-18 18:55:21 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_NATIVE_BENCHMARK := true")
|
2017-04-25 03:10:29 +02:00
|
|
|
})
|
2017-07-15 00:20:13 +02:00
|
|
|
|
|
|
|
androidMkWriteTestData(benchmark.data, ctx, ret)
|
2016-07-30 02:28:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (test *testBinary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
ctx.subAndroidMk(ret, test.binaryDecorator)
|
2017-01-17 22:25:49 +01:00
|
|
|
ret.Class = "NATIVE_TESTS"
|
2016-07-30 02:28:03 +02:00
|
|
|
if Bool(test.Properties.Test_per_src) {
|
2017-11-07 19:57:05 +01:00
|
|
|
ret.SubName = "_" + String(test.binaryDecorator.Properties.Stem)
|
2016-03-24 21:14:12 +01:00
|
|
|
}
|
2017-02-01 23:12:44 +01:00
|
|
|
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2017-03-28 01:27:50 +02:00
|
|
|
if len(test.Properties.Test_suites) > 0 {
|
2017-04-03 21:29:25 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",
|
2017-03-28 01:27:50 +02:00
|
|
|
strings.Join(test.Properties.Test_suites, " "))
|
|
|
|
}
|
2018-08-03 00:00:46 +02:00
|
|
|
if test.Properties.Test_config != nil {
|
|
|
|
fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",
|
|
|
|
test.Properties.Test_config)
|
|
|
|
}
|
2017-03-28 01:27:50 +02:00
|
|
|
})
|
|
|
|
|
2017-07-15 00:20:13 +02:00
|
|
|
androidMkWriteTestData(test.data, ctx, ret)
|
2016-03-24 21:14:12 +01:00
|
|
|
}
|
|
|
|
|
2016-07-30 02:28:03 +02:00
|
|
|
func (test *testLibrary) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
ctx.subAndroidMk(ret, test.libraryDecorator)
|
|
|
|
}
|
2016-05-17 00:56:53 +02:00
|
|
|
|
2016-07-30 02:28:03 +02:00
|
|
|
func (library *toolchainLibraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
ret.Class = "STATIC_LIBRARIES"
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2016-05-17 00:56:53 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+outputFile.Ext())
|
|
|
|
fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2016-07-14 01:50:22 +02:00
|
|
|
func (stripper *stripper) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
// Make only supports stripping target modules
|
|
|
|
if ctx.Target().Os != android.Android {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2017-11-07 19:57:05 +01:00
|
|
|
if Bool(stripper.StripProperties.Strip.None) {
|
|
|
|
|
2016-06-11 02:20:30 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := false")
|
2017-11-07 19:57:05 +01:00
|
|
|
} else if Bool(stripper.StripProperties.Strip.Keep_symbols) {
|
2016-06-11 02:20:30 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := keep_symbols")
|
2016-07-14 01:50:22 +02:00
|
|
|
} else {
|
|
|
|
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := mini-debug-info")
|
2016-06-11 02:20:30 +02:00
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2016-09-15 00:04:48 +02:00
|
|
|
func (packer *relocationPacker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2016-09-15 00:04:48 +02:00
|
|
|
if packer.Properties.PackingRelocations {
|
|
|
|
fmt.Fprintln(w, "LOCAL_PACK_MODULE_RELOCATIONS := true")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2016-07-14 01:50:22 +02:00
|
|
|
func (installer *baseInstaller) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
2016-09-29 21:17:49 +02:00
|
|
|
// Soong installation is only supported for host modules. Have Make
|
|
|
|
// installation trigger Soong installation.
|
|
|
|
if ctx.Target().Os.Class == android.Host {
|
|
|
|
ret.OutputFile = android.OptionalPathForPath(installer.path)
|
|
|
|
}
|
|
|
|
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2016-03-24 21:14:12 +01:00
|
|
|
path := installer.path.RelPathString()
|
2016-03-30 02:32:06 +02:00
|
|
|
dir, file := filepath.Split(path)
|
|
|
|
stem := strings.TrimSuffix(file, filepath.Ext(file))
|
2016-08-30 00:53:15 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+filepath.Ext(file))
|
2016-05-03 23:08:40 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+filepath.Clean(dir))
|
2016-03-30 02:32:06 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem)
|
2016-03-24 21:14:12 +01:00
|
|
|
})
|
2015-07-09 03:13:11 +02:00
|
|
|
}
|
2016-06-18 01:45:24 +02:00
|
|
|
|
2016-07-30 02:28:03 +02:00
|
|
|
func (c *stubDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
2017-04-08 00:21:13 +02:00
|
|
|
ret.SubName = ndkLibrarySuffix + "." + c.properties.ApiLevel
|
2016-08-08 19:45:03 +02:00
|
|
|
ret.Class = "SHARED_LIBRARIES"
|
2016-06-18 01:45:24 +02:00
|
|
|
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2017-11-29 02:34:01 +01:00
|
|
|
path, file := filepath.Split(c.installPath.String())
|
2016-06-18 01:45:24 +02:00
|
|
|
stem := strings.TrimSuffix(file, filepath.Ext(file))
|
2016-08-08 23:44:56 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+outputFile.Ext())
|
2016-06-18 01:45:24 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_PATH := "+path)
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem)
|
2017-04-04 23:13:45 +02:00
|
|
|
fmt.Fprintln(w, "LOCAL_NO_NOTICE_FILE := true")
|
2016-06-18 01:45:24 +02:00
|
|
|
|
|
|
|
// Prevent make from installing the libraries to obj/lib (since we have
|
|
|
|
// dozens of libraries with the same name, they'll clobber each other
|
|
|
|
// and the real versions of the libraries from the platform).
|
|
|
|
fmt.Fprintln(w, "LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES := false")
|
|
|
|
})
|
|
|
|
}
|
2017-03-19 21:44:32 +01:00
|
|
|
|
|
|
|
func (c *llndkStubDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
ret.Class = "SHARED_LIBRARIES"
|
2018-01-31 16:54:12 +01:00
|
|
|
ret.SubName = vendorSuffix
|
2017-03-19 21:44:32 +01:00
|
|
|
|
2017-08-11 01:32:23 +02:00
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
2017-03-19 21:44:32 +01:00
|
|
|
c.libraryDecorator.androidMkWriteExportedFlags(w)
|
|
|
|
|
|
|
|
fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)"+outputFile.Ext())
|
|
|
|
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := false")
|
|
|
|
fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")
|
|
|
|
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
|
|
|
|
fmt.Fprintln(w, "LOCAL_NO_NOTICE_FILE := 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
|
|
|
fmt.Fprintln(w, "LOCAL_USE_VNDK := true")
|
2017-03-19 21:44:32 +01:00
|
|
|
})
|
|
|
|
}
|
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
|
|
|
|
|
|
|
func (c *vndkPrebuiltLibraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
ret.Class = "SHARED_LIBRARIES"
|
|
|
|
|
2017-12-29 08:20:21 +01:00
|
|
|
ret.SubName = c.NameSuffix()
|
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
|
|
|
|
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
|
|
|
c.libraryDecorator.androidMkWriteExportedFlags(w)
|
|
|
|
|
|
|
|
path := c.path.RelPathString()
|
|
|
|
dir, file := filepath.Split(path)
|
|
|
|
stem := strings.TrimSuffix(file, filepath.Ext(file))
|
|
|
|
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := false")
|
|
|
|
fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")
|
|
|
|
fmt.Fprintln(w, "LOCAL_USE_VNDK := true")
|
|
|
|
fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)"+outputFile.Ext())
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+filepath.Ext(file))
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+filepath.Clean(dir))
|
|
|
|
fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem)
|
|
|
|
})
|
2017-12-06 22:08:00 +01:00
|
|
|
}
|
2017-12-14 22:23:15 +01:00
|
|
|
|
|
|
|
func (c *ndkPrebuiltStlLinker) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
ret.Class = "SHARED_LIBRARIES"
|
|
|
|
|
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
|
|
|
// Prevent make from installing the libraries to obj/lib (since we have
|
|
|
|
// dozens of libraries with the same name, they'll clobber each other
|
|
|
|
// and the real versions of the libraries from the platform).
|
|
|
|
fmt.Fprintln(w, "LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES := false")
|
|
|
|
})
|
|
|
|
}
|
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
|
|
|
|
|
|
|
func (c *vendorPublicLibraryStubDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
|
|
|
|
ret.Class = "SHARED_LIBRARIES"
|
|
|
|
ret.SubName = vendorPublicLibrarySuffix
|
|
|
|
|
|
|
|
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) {
|
|
|
|
c.libraryDecorator.androidMkWriteExportedFlags(w)
|
|
|
|
|
|
|
|
fmt.Fprintln(w, "LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)"+outputFile.Ext())
|
|
|
|
fmt.Fprintln(w, "LOCAL_STRIP_MODULE := false")
|
|
|
|
fmt.Fprintln(w, "LOCAL_SYSTEM_SHARED_LIBRARIES :=")
|
|
|
|
fmt.Fprintln(w, "LOCAL_UNINSTALLABLE_MODULE := true")
|
|
|
|
fmt.Fprintln(w, "LOCAL_NO_NOTICE_FILE := true")
|
|
|
|
})
|
|
|
|
}
|