2017-06-23 12:24:43 +02:00
|
|
|
// Copyright 2017 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 (
|
2019-05-14 11:52:49 +02:00
|
|
|
"encoding/json"
|
2018-10-15 14:05:27 +02:00
|
|
|
"errors"
|
2019-10-30 10:43:49 +01:00
|
|
|
"fmt"
|
2019-05-09 06:29:15 +02:00
|
|
|
"path/filepath"
|
2019-10-22 13:15:20 +02:00
|
|
|
"sort"
|
2017-08-03 14:22:50 +02:00
|
|
|
"strings"
|
|
|
|
"sync"
|
|
|
|
|
2017-06-23 12:24:43 +02:00
|
|
|
"android/soong/android"
|
2018-11-13 05:19:56 +01:00
|
|
|
"android/soong/cc/config"
|
2020-06-01 19:45:49 +02:00
|
|
|
"android/soong/etc"
|
2020-07-28 06:26:48 +02:00
|
|
|
|
|
|
|
"github.com/google/blueprint"
|
2017-06-23 12:24:43 +02:00
|
|
|
)
|
|
|
|
|
2019-11-06 08:53:07 +01:00
|
|
|
const (
|
|
|
|
llndkLibrariesTxt = "llndk.libraries.txt"
|
|
|
|
vndkCoreLibrariesTxt = "vndkcore.libraries.txt"
|
|
|
|
vndkSpLibrariesTxt = "vndksp.libraries.txt"
|
|
|
|
vndkPrivateLibrariesTxt = "vndkprivate.libraries.txt"
|
2020-12-07 04:44:03 +01:00
|
|
|
vndkProductLibrariesTxt = "vndkproduct.libraries.txt"
|
2019-11-06 08:53:07 +01:00
|
|
|
vndkUsingCoreVariantLibrariesTxt = "vndkcorevariant.libraries.txt"
|
|
|
|
)
|
|
|
|
|
|
|
|
func VndkLibrariesTxtModules(vndkVersion string) []string {
|
|
|
|
if vndkVersion == "current" {
|
|
|
|
return []string{
|
|
|
|
llndkLibrariesTxt,
|
|
|
|
vndkCoreLibrariesTxt,
|
|
|
|
vndkSpLibrariesTxt,
|
|
|
|
vndkPrivateLibrariesTxt,
|
2020-12-07 04:44:03 +01:00
|
|
|
vndkProductLibrariesTxt,
|
2019-11-06 08:53:07 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Snapshot vndks have their own *.libraries.VER.txt files.
|
|
|
|
// Note that snapshots don't have "vndkcorevariant.libraries.VER.txt"
|
|
|
|
return []string{
|
|
|
|
insertVndkVersion(llndkLibrariesTxt, vndkVersion),
|
|
|
|
insertVndkVersion(vndkCoreLibrariesTxt, vndkVersion),
|
|
|
|
insertVndkVersion(vndkSpLibrariesTxt, vndkVersion),
|
|
|
|
insertVndkVersion(vndkPrivateLibrariesTxt, vndkVersion),
|
2020-12-07 04:44:03 +01:00
|
|
|
insertVndkVersion(vndkProductLibrariesTxt, vndkVersion),
|
2019-11-06 08:53:07 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-23 12:24:43 +02:00
|
|
|
type VndkProperties struct {
|
|
|
|
Vndk struct {
|
|
|
|
// declared as a VNDK or VNDK-SP module. The vendor variant
|
|
|
|
// will be installed in /system instead of /vendor partition.
|
|
|
|
//
|
2020-10-29 08:49:43 +01:00
|
|
|
// `vendor_available` and `product_available` must be explicitly
|
|
|
|
// set to either true or false together with `vndk: {enabled: true}`.
|
2017-06-23 12:24:43 +02:00
|
|
|
Enabled *bool
|
|
|
|
|
|
|
|
// declared as a VNDK-SP module, which is a subset of VNDK.
|
|
|
|
//
|
|
|
|
// `vndk: { enabled: true }` must set together.
|
|
|
|
//
|
|
|
|
// All these modules are allowed to link to VNDK-SP or LL-NDK
|
|
|
|
// modules only. Other dependency will cause link-type errors.
|
|
|
|
//
|
|
|
|
// If `support_system_process` is not set or set to false,
|
|
|
|
// the module is VNDK-core and can link to other VNDK-core,
|
|
|
|
// VNDK-SP or LL-NDK modules only.
|
|
|
|
Support_system_process *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
|
|
|
|
Define vndk.private property for VNDK-private libraries
To define VNDK-private libraries, we used `vendor_available: false`.
Because of it, `vendor_available == nil` had different meaning from
`vendor_available: false` for the VNDK libraries.
To clarify this, we change the logic for defining VNDK-private
libraries which was:
cc_library {
name: "vndk_private",
vendor_available: false,
product_available: false,
vndk: {
enabled: true,
},
}
It must be replaced with
cc_library {
name: "vndk_private",
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
private: true,
},
}
Bug: 175768895
Test: m nothing
Change-Id: I81769f57c2231e54b682a28e4b82631ab9f3d390
2020-12-23 10:23:14 +01:00
|
|
|
// declared as a VNDK-private module.
|
|
|
|
// This module still creates the vendor and product variants refering
|
|
|
|
// to the `vendor_available: true` and `product_available: true`
|
|
|
|
// properties. However, it is only available to the other VNDK modules
|
|
|
|
// but not to the non-VNDK vendor or product modules.
|
|
|
|
Private *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
|
|
|
// Extending another module
|
|
|
|
Extends *string
|
2017-06-23 12:24:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type vndkdep struct {
|
|
|
|
Properties VndkProperties
|
|
|
|
}
|
|
|
|
|
|
|
|
func (vndk *vndkdep) props() []interface{} {
|
|
|
|
return []interface{}{&vndk.Properties}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (vndk *vndkdep) begin(ctx BaseModuleContext) {}
|
|
|
|
|
|
|
|
func (vndk *vndkdep) deps(ctx BaseModuleContext, deps Deps) Deps {
|
|
|
|
return deps
|
|
|
|
}
|
|
|
|
|
|
|
|
func (vndk *vndkdep) isVndk() bool {
|
|
|
|
return Bool(vndk.Properties.Vndk.Enabled)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (vndk *vndkdep) isVndkSp() bool {
|
|
|
|
return Bool(vndk.Properties.Vndk.Support_system_process)
|
|
|
|
}
|
|
|
|
|
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 (vndk *vndkdep) isVndkExt() bool {
|
|
|
|
return vndk.Properties.Vndk.Extends != nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (vndk *vndkdep) getVndkExtendsModuleName() string {
|
|
|
|
return String(vndk.Properties.Vndk.Extends)
|
|
|
|
}
|
|
|
|
|
2017-06-23 12:24:43 +02:00
|
|
|
func (vndk *vndkdep) typeName() string {
|
|
|
|
if !vndk.isVndk() {
|
|
|
|
return "native:vendor"
|
|
|
|
}
|
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 !vndk.isVndkExt() {
|
|
|
|
if !vndk.isVndkSp() {
|
|
|
|
return "native:vendor:vndk"
|
|
|
|
}
|
|
|
|
return "native:vendor:vndksp"
|
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
if !vndk.isVndkSp() {
|
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 "native:vendor:vndkext"
|
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
|
|
|
return "native:vendor:vndkspext"
|
2017-06-23 12:24:43 +02:00
|
|
|
}
|
|
|
|
|
2020-10-29 08:49:43 +01:00
|
|
|
// VNDK link type check from a module with UseVndk() == true.
|
2020-10-19 11:51:07 +02:00
|
|
|
func (vndk *vndkdep) vndkCheckLinkType(ctx android.BaseModuleContext, to *Module, tag blueprint.DependencyTag) {
|
2017-06-23 12:24:43 +02:00
|
|
|
if to.linker == nil {
|
|
|
|
return
|
|
|
|
}
|
2017-08-16 07:05:54 +02:00
|
|
|
if !vndk.isVndk() {
|
Define vndk.private property for VNDK-private libraries
To define VNDK-private libraries, we used `vendor_available: false`.
Because of it, `vendor_available == nil` had different meaning from
`vendor_available: false` for the VNDK libraries.
To clarify this, we change the logic for defining VNDK-private
libraries which was:
cc_library {
name: "vndk_private",
vendor_available: false,
product_available: false,
vndk: {
enabled: true,
},
}
It must be replaced with
cc_library {
name: "vndk_private",
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
private: true,
},
}
Bug: 175768895
Test: m nothing
Change-Id: I81769f57c2231e54b682a28e4b82631ab9f3d390
2020-12-23 10:23:14 +01:00
|
|
|
// Non-VNDK modules those installed to /vendor, /system/vendor,
|
|
|
|
// /product or /system/product cannot depend on VNDK-private modules
|
|
|
|
// that include VNDK-core-private, VNDK-SP-private and LLNDK-private.
|
|
|
|
if to.IsVndkPrivate() {
|
|
|
|
ctx.ModuleErrorf("non-VNDK module should not link to %q which has `private: true`", to.Name())
|
2017-08-16 07:05:54 +02:00
|
|
|
}
|
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
if lib, ok := to.linker.(*libraryDecorator); !ok || !lib.shared() {
|
|
|
|
// Check only shared libraries.
|
2020-12-17 01:46:01 +01:00
|
|
|
// Other (static) libraries are allowed to link.
|
2017-06-23 12:24:43 +02:00
|
|
|
return
|
|
|
|
}
|
2020-12-17 01:46:01 +01:00
|
|
|
|
|
|
|
if to.IsLlndk() {
|
|
|
|
// LL-NDK libraries are allowed to link
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-10-18 23:49:46 +02:00
|
|
|
if !to.UseVndk() {
|
2017-06-23 12:24:43 +02:00
|
|
|
ctx.ModuleErrorf("(%s) should not link to %q which is not a vendor-available library",
|
|
|
|
vndk.typeName(), to.Name())
|
|
|
|
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 tag == vndkExtDepTag {
|
|
|
|
// Ensure `extends: "name"` property refers a vndk module that has vendor_available
|
|
|
|
// and has identical vndk properties.
|
|
|
|
if to.vndkdep == nil || !to.vndkdep.isVndk() {
|
|
|
|
ctx.ModuleErrorf("`extends` refers a non-vndk module %q", to.Name())
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if vndk.isVndkSp() != to.vndkdep.isVndkSp() {
|
|
|
|
ctx.ModuleErrorf(
|
|
|
|
"`extends` refers a module %q with mismatched support_system_process",
|
|
|
|
to.Name())
|
|
|
|
return
|
|
|
|
}
|
Define vndk.private property for VNDK-private libraries
To define VNDK-private libraries, we used `vendor_available: false`.
Because of it, `vendor_available == nil` had different meaning from
`vendor_available: false` for the VNDK libraries.
To clarify this, we change the logic for defining VNDK-private
libraries which was:
cc_library {
name: "vndk_private",
vendor_available: false,
product_available: false,
vndk: {
enabled: true,
},
}
It must be replaced with
cc_library {
name: "vndk_private",
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
private: true,
},
}
Bug: 175768895
Test: m nothing
Change-Id: I81769f57c2231e54b682a28e4b82631ab9f3d390
2020-12-23 10:23:14 +01:00
|
|
|
if to.IsVndkPrivate() {
|
2020-10-29 10:24:11 +01:00
|
|
|
ctx.ModuleErrorf(
|
Define vndk.private property for VNDK-private libraries
To define VNDK-private libraries, we used `vendor_available: false`.
Because of it, `vendor_available == nil` had different meaning from
`vendor_available: false` for the VNDK libraries.
To clarify this, we change the logic for defining VNDK-private
libraries which was:
cc_library {
name: "vndk_private",
vendor_available: false,
product_available: false,
vndk: {
enabled: true,
},
}
It must be replaced with
cc_library {
name: "vndk_private",
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
private: true,
},
}
Bug: 175768895
Test: m nothing
Change-Id: I81769f57c2231e54b682a28e4b82631ab9f3d390
2020-12-23 10:23:14 +01:00
|
|
|
"`extends` refers module %q which has `private: true`",
|
2020-10-29 10:24:11 +01:00
|
|
|
to.Name())
|
|
|
|
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
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
if to.vndkdep == nil {
|
|
|
|
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
|
|
|
|
2018-03-29 08:08:15 +02:00
|
|
|
// Check the dependencies of VNDK shared libraries.
|
2018-10-15 14:05:27 +02:00
|
|
|
if err := vndkIsVndkDepAllowed(vndk, to.vndkdep); err != nil {
|
|
|
|
ctx.ModuleErrorf("(%s) should not link to %q (%s): %v",
|
|
|
|
vndk.typeName(), to.Name(), to.vndkdep.typeName(), err)
|
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
|
|
|
|
}
|
2018-03-29 08:08:15 +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
|
|
|
|
2018-10-15 14:05:27 +02:00
|
|
|
func vndkIsVndkDepAllowed(from *vndkdep, to *vndkdep) error {
|
2018-03-29 08:08:15 +02:00
|
|
|
// Check the dependencies of VNDK, VNDK-Ext, VNDK-SP, VNDK-SP-Ext and vendor modules.
|
|
|
|
if from.isVndkExt() {
|
|
|
|
if from.isVndkSp() {
|
2018-10-15 14:05:27 +02:00
|
|
|
if to.isVndk() && !to.isVndkSp() {
|
|
|
|
return errors.New("VNDK-SP extensions must not depend on VNDK or VNDK extensions")
|
|
|
|
}
|
|
|
|
return nil
|
2018-03-29 08:08:15 +02:00
|
|
|
}
|
|
|
|
// VNDK-Ext may depend on VNDK, VNDK-Ext, VNDK-SP, VNDK-SP-Ext, or vendor libs.
|
2018-10-15 14:05:27 +02:00
|
|
|
return nil
|
2018-03-29 08:08:15 +02:00
|
|
|
}
|
|
|
|
if from.isVndk() {
|
|
|
|
if to.isVndkExt() {
|
2018-10-15 14:05:27 +02:00
|
|
|
return errors.New("VNDK-core and VNDK-SP must not depend on VNDK extensions")
|
2018-03-29 08:08:15 +02:00
|
|
|
}
|
|
|
|
if from.isVndkSp() {
|
2018-10-15 14:05:27 +02:00
|
|
|
if !to.isVndkSp() {
|
|
|
|
return errors.New("VNDK-SP must only depend on VNDK-SP")
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
if !to.isVndk() {
|
|
|
|
return errors.New("VNDK-core must only depend on VNDK-core or VNDK-SP")
|
2018-03-29 08:08:15 +02:00
|
|
|
}
|
2018-10-15 14:05:27 +02:00
|
|
|
return nil
|
2017-06-23 12:24:43 +02:00
|
|
|
}
|
2018-03-29 08:08:15 +02:00
|
|
|
// Vendor modules may depend on VNDK, VNDK-Ext, VNDK-SP, VNDK-SP-Ext, or vendor libs.
|
2018-10-15 14:05:27 +02:00
|
|
|
return nil
|
2017-06-23 12:24:43 +02:00
|
|
|
}
|
2017-08-03 14:22:50 +02:00
|
|
|
|
|
|
|
var (
|
2020-12-07 04:44:03 +01:00
|
|
|
vndkCoreLibrariesKey = android.NewOnceKey("vndkCoreLibraries")
|
|
|
|
vndkSpLibrariesKey = android.NewOnceKey("vndkSpLibraries")
|
|
|
|
llndkLibrariesKey = android.NewOnceKey("llndkLibraries")
|
|
|
|
vndkPrivateLibrariesKey = android.NewOnceKey("vndkPrivateLibraries")
|
|
|
|
vndkProductLibrariesKey = android.NewOnceKey("vndkProductLibraries")
|
2019-12-30 03:12:55 +01:00
|
|
|
vndkUsingCoreVariantLibrariesKey = android.NewOnceKey("vndkUsingCoreVariantLibraries")
|
2019-11-01 00:45:59 +01:00
|
|
|
vndkMustUseVendorVariantListKey = android.NewOnceKey("vndkMustUseVendorVariantListKey")
|
|
|
|
vndkLibrariesLock sync.Mutex
|
2019-05-14 11:52:49 +02:00
|
|
|
)
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
func vndkCoreLibraries(config android.Config) map[string]string {
|
2019-05-09 03:56:13 +02:00
|
|
|
return config.Once(vndkCoreLibrariesKey, func() interface{} {
|
2019-10-30 10:43:49 +01:00
|
|
|
return make(map[string]string)
|
|
|
|
}).(map[string]string)
|
2019-05-09 03:56:13 +02:00
|
|
|
}
|
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
func vndkSpLibraries(config android.Config) map[string]string {
|
2019-05-09 03:56:13 +02:00
|
|
|
return config.Once(vndkSpLibrariesKey, func() interface{} {
|
2019-10-30 10:43:49 +01:00
|
|
|
return make(map[string]string)
|
|
|
|
}).(map[string]string)
|
2019-05-09 03:56:13 +02:00
|
|
|
}
|
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
func llndkLibraries(config android.Config) map[string]string {
|
2019-05-09 03:56:13 +02:00
|
|
|
return config.Once(llndkLibrariesKey, func() interface{} {
|
2019-10-30 10:43:49 +01:00
|
|
|
return make(map[string]string)
|
|
|
|
}).(map[string]string)
|
|
|
|
}
|
|
|
|
|
|
|
|
func vndkPrivateLibraries(config android.Config) map[string]string {
|
2019-05-09 03:56:13 +02:00
|
|
|
return config.Once(vndkPrivateLibrariesKey, func() interface{} {
|
2019-10-30 10:43:49 +01:00
|
|
|
return make(map[string]string)
|
|
|
|
}).(map[string]string)
|
2019-05-09 03:56:13 +02:00
|
|
|
}
|
|
|
|
|
2020-12-07 04:44:03 +01:00
|
|
|
func vndkProductLibraries(config android.Config) map[string]string {
|
|
|
|
return config.Once(vndkProductLibrariesKey, func() interface{} {
|
|
|
|
return make(map[string]string)
|
|
|
|
}).(map[string]string)
|
|
|
|
}
|
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
func vndkUsingCoreVariantLibraries(config android.Config) map[string]string {
|
2019-05-09 03:56:13 +02:00
|
|
|
return config.Once(vndkUsingCoreVariantLibrariesKey, func() interface{} {
|
2019-10-30 10:43:49 +01:00
|
|
|
return make(map[string]string)
|
|
|
|
}).(map[string]string)
|
2019-05-09 03:56:13 +02:00
|
|
|
}
|
|
|
|
|
2019-10-22 12:32:18 +02:00
|
|
|
func vndkMustUseVendorVariantList(cfg android.Config) []string {
|
|
|
|
return cfg.Once(vndkMustUseVendorVariantListKey, func() interface{} {
|
|
|
|
return config.VndkMustUseVendorVariantList
|
|
|
|
}).([]string)
|
|
|
|
}
|
|
|
|
|
|
|
|
// test may call this to override global configuration(config.VndkMustUseVendorVariantList)
|
|
|
|
// when it is called, it must be before the first call to vndkMustUseVendorVariantList()
|
|
|
|
func setVndkMustUseVendorVariantListForTest(config android.Config, mustUseVendorVariantList []string) {
|
2019-11-01 00:45:59 +01:00
|
|
|
config.Once(vndkMustUseVendorVariantListKey, func() interface{} {
|
2019-10-22 12:32:18 +02:00
|
|
|
return mustUseVendorVariantList
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2019-05-09 06:29:15 +02:00
|
|
|
func processLlndkLibrary(mctx android.BottomUpMutatorContext, m *Module) {
|
|
|
|
lib := m.linker.(*llndkStubDecorator)
|
2020-10-14 03:43:54 +02:00
|
|
|
name := m.ImplementationModuleName(mctx)
|
|
|
|
filename := name + ".so"
|
2019-05-09 06:29:15 +02:00
|
|
|
|
|
|
|
vndkLibrariesLock.Lock()
|
|
|
|
defer vndkLibrariesLock.Unlock()
|
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
llndkLibraries(mctx.Config())[name] = filename
|
2020-12-17 01:46:01 +01:00
|
|
|
m.VendorProperties.IsLLNDK = true
|
2021-01-07 09:45:31 +01:00
|
|
|
if Bool(lib.Properties.Private) {
|
2019-10-30 10:43:49 +01:00
|
|
|
vndkPrivateLibraries(mctx.Config())[name] = filename
|
2020-12-17 01:46:01 +01:00
|
|
|
m.VendorProperties.IsLLNDKPrivate = true
|
2020-03-21 15:21:46 +01:00
|
|
|
}
|
2019-05-09 06:29:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func processVndkLibrary(mctx android.BottomUpMutatorContext, m *Module) {
|
2020-12-07 04:44:03 +01:00
|
|
|
if m.InProduct() {
|
|
|
|
// We may skip the steps for the product variants because they
|
|
|
|
// are already covered by the vendor variants.
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
name := m.BaseModuleName()
|
|
|
|
filename, err := getVndkFileName(m)
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2020-10-24 02:22:06 +02:00
|
|
|
if lib := m.library; lib != nil && lib.hasStubsVariants() && name != "libz" {
|
2020-05-18 11:30:14 +02:00
|
|
|
// b/155456180 libz is the ONLY exception here. We don't want to make
|
|
|
|
// libz an LLNDK library because we in general can't guarantee that
|
|
|
|
// libz will behave consistently especially about the compression.
|
|
|
|
// i.e. the compressed output might be different across releases.
|
|
|
|
// As the library is an external one, it's risky to keep the compatibility
|
|
|
|
// promise if it becomes an LLNDK.
|
2020-03-31 08:31:17 +02:00
|
|
|
mctx.PropertyErrorf("vndk.enabled", "This library provides stubs. Shouldn't be VNDK. Consider making it as LLNDK")
|
|
|
|
}
|
|
|
|
|
2019-05-09 06:29:15 +02:00
|
|
|
vndkLibrariesLock.Lock()
|
|
|
|
defer vndkLibrariesLock.Unlock()
|
|
|
|
|
2019-10-22 12:32:18 +02:00
|
|
|
if inList(name, vndkMustUseVendorVariantList(mctx.Config())) {
|
|
|
|
m.Properties.MustUseVendorVariant = true
|
|
|
|
}
|
2019-10-30 10:43:49 +01:00
|
|
|
if mctx.DeviceConfig().VndkUseCoreVariant() && !m.Properties.MustUseVendorVariant {
|
|
|
|
vndkUsingCoreVariantLibraries(mctx.Config())[name] = filename
|
2019-05-09 06:29:15 +02:00
|
|
|
}
|
2019-10-30 10:43:49 +01:00
|
|
|
|
2019-05-09 06:29:15 +02:00
|
|
|
if m.vndkdep.isVndkSp() {
|
2019-10-30 10:43:49 +01:00
|
|
|
vndkSpLibraries(mctx.Config())[name] = filename
|
2019-05-09 06:29:15 +02:00
|
|
|
} else {
|
2019-10-30 10:43:49 +01:00
|
|
|
vndkCoreLibraries(mctx.Config())[name] = filename
|
2019-05-09 06:29:15 +02:00
|
|
|
}
|
Define vndk.private property for VNDK-private libraries
To define VNDK-private libraries, we used `vendor_available: false`.
Because of it, `vendor_available == nil` had different meaning from
`vendor_available: false` for the VNDK libraries.
To clarify this, we change the logic for defining VNDK-private
libraries which was:
cc_library {
name: "vndk_private",
vendor_available: false,
product_available: false,
vndk: {
enabled: true,
},
}
It must be replaced with
cc_library {
name: "vndk_private",
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
private: true,
},
}
Bug: 175768895
Test: m nothing
Change-Id: I81769f57c2231e54b682a28e4b82631ab9f3d390
2020-12-23 10:23:14 +01:00
|
|
|
if m.IsVndkPrivate() {
|
2019-10-30 10:43:49 +01:00
|
|
|
vndkPrivateLibraries(mctx.Config())[name] = filename
|
2019-05-09 06:29:15 +02:00
|
|
|
}
|
2021-01-07 09:45:31 +01:00
|
|
|
if Bool(m.VendorProperties.Product_available) {
|
2020-12-07 04:44:03 +01:00
|
|
|
vndkProductLibraries(mctx.Config())[name] = filename
|
|
|
|
}
|
2019-05-09 06:29:15 +02:00
|
|
|
}
|
|
|
|
|
2020-07-28 19:08:20 +02:00
|
|
|
// Check for modules that mustn't be VNDK
|
2020-06-09 10:15:37 +02:00
|
|
|
func shouldSkipVndkMutator(m *Module) bool {
|
2019-10-18 09:26:59 +02:00
|
|
|
if !m.Enabled() {
|
2020-06-09 10:15:37 +02:00
|
|
|
return true
|
2019-10-18 09:26:59 +02:00
|
|
|
}
|
2020-06-09 10:15:37 +02:00
|
|
|
if !m.Device() {
|
|
|
|
// Skip non-device modules
|
|
|
|
return true
|
2019-10-28 21:18:21 +01:00
|
|
|
}
|
2019-10-18 09:26:59 +02:00
|
|
|
if m.Target().NativeBridge == android.NativeBridgeEnabled {
|
2020-06-09 10:15:37 +02:00
|
|
|
// Skip native_bridge modules
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
func IsForVndkApex(mctx android.BottomUpMutatorContext, m *Module) bool {
|
|
|
|
if shouldSkipVndkMutator(m) {
|
2019-10-18 09:26:59 +02:00
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
// prebuilt vndk modules should match with device
|
|
|
|
// TODO(b/142675459): Use enabled: to select target device in vndk_prebuilt_shared
|
|
|
|
// When b/142675459 is landed, remove following check
|
|
|
|
if p, ok := m.linker.(*vndkPrebuiltLibraryDecorator); ok && !p.matchesWithDevice(mctx.DeviceConfig()) {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if lib, ok := m.linker.(libraryInterface); ok {
|
2020-03-27 08:06:55 +01:00
|
|
|
// VNDK APEX for VNDK-Lite devices will have VNDK-SP libraries from core variants
|
|
|
|
if mctx.DeviceConfig().VndkVersion() == "" {
|
|
|
|
// b/73296261: filter out libz.so because it is considered as LLNDK for VNDK-lite devices
|
|
|
|
if mctx.ModuleName() == "libz" {
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
return m.ImageVariation().Variation == android.CoreVariation && lib.shared() && m.isVndkSp()
|
|
|
|
}
|
|
|
|
|
2019-11-18 11:52:14 +01:00
|
|
|
useCoreVariant := m.VndkVersion() == mctx.DeviceConfig().PlatformVndkVersion() &&
|
2019-10-28 21:18:21 +01:00
|
|
|
mctx.DeviceConfig().VndkUseCoreVariant() && !m.MustUseVendorVariant()
|
2020-12-02 15:00:51 +01:00
|
|
|
return lib.shared() && m.inVendor() && m.IsVndk() && !m.IsVndkExt() && !useCoreVariant
|
2019-10-18 09:26:59 +02:00
|
|
|
}
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
2017-08-03 14:22:50 +02:00
|
|
|
// gather list of vndk-core, vndk-sp, and ll-ndk libs
|
2018-12-19 09:12:36 +01:00
|
|
|
func VndkMutator(mctx android.BottomUpMutatorContext) {
|
2019-05-09 06:29:15 +02:00
|
|
|
m, ok := mctx.Module().(*Module)
|
|
|
|
if !ok {
|
|
|
|
return
|
|
|
|
}
|
2020-06-09 10:15:37 +02:00
|
|
|
|
|
|
|
if shouldSkipVndkMutator(m) {
|
2019-09-08 04:34:06 +02:00
|
|
|
return
|
|
|
|
}
|
2019-05-09 06:29:15 +02:00
|
|
|
|
|
|
|
if _, ok := m.linker.(*llndkStubDecorator); ok {
|
|
|
|
processLlndkLibrary(mctx, m)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-12-17 01:46:01 +01:00
|
|
|
// This is a temporary measure to copy the properties from an llndk_library into the cc_library
|
|
|
|
// that will actually build the stubs. It will be removed once the properties are moved into
|
|
|
|
// the cc_library in the Android.bp files.
|
|
|
|
mergeLLNDKToLib := func(llndk *Module, llndkProperties *llndkLibraryProperties, flagExporter *flagExporter) {
|
|
|
|
if llndkLib := moduleLibraryInterface(llndk); llndkLib != nil {
|
|
|
|
*llndkProperties = llndkLib.(*llndkStubDecorator).Properties
|
|
|
|
flagExporter.Properties = llndkLib.(*llndkStubDecorator).flagExporter.Properties
|
|
|
|
|
|
|
|
m.VendorProperties.IsLLNDK = llndk.VendorProperties.IsLLNDK
|
|
|
|
m.VendorProperties.IsLLNDKPrivate = llndk.VendorProperties.IsLLNDKPrivate
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-21 18:11:10 +01:00
|
|
|
lib, isLib := m.linker.(*libraryDecorator)
|
|
|
|
prebuiltLib, isPrebuiltLib := m.linker.(*prebuiltLibraryLinker)
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2020-12-21 18:11:10 +01:00
|
|
|
if m.UseVndk() && isLib && lib.hasLLNDKStubs() {
|
2020-12-17 01:46:01 +01:00
|
|
|
llndk := mctx.AddVariationDependencies(nil, llndkStubDepTag, String(lib.Properties.Llndk_stubs))
|
|
|
|
mergeLLNDKToLib(llndk[0].(*Module), &lib.Properties.Llndk, &lib.flagExporter)
|
|
|
|
}
|
2020-12-21 18:11:10 +01:00
|
|
|
if m.UseVndk() && isPrebuiltLib && prebuiltLib.hasLLNDKStubs() {
|
|
|
|
llndk := mctx.AddVariationDependencies(nil, llndkStubDepTag, String(prebuiltLib.Properties.Llndk_stubs))
|
|
|
|
mergeLLNDKToLib(llndk[0].(*Module), &prebuiltLib.Properties.Llndk, &prebuiltLib.flagExporter)
|
2020-12-17 01:46:01 +01:00
|
|
|
}
|
|
|
|
|
2020-12-21 18:11:10 +01:00
|
|
|
if (isLib && lib.buildShared()) || (isPrebuiltLib && prebuiltLib.buildShared()) {
|
2019-08-26 09:52:35 +02:00
|
|
|
if m.vndkdep != nil && m.vndkdep.isVndk() && !m.vndkdep.isVndkExt() {
|
2019-05-09 06:29:15 +02:00
|
|
|
processVndkLibrary(mctx, m)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func init() {
|
2020-12-28 22:50:21 +01:00
|
|
|
RegisterVndkLibraryTxtTypes(android.InitRegistrationContext)
|
2019-05-09 06:29:15 +02:00
|
|
|
android.RegisterSingletonType("vndk-snapshot", VndkSnapshotSingleton)
|
|
|
|
}
|
|
|
|
|
2020-12-28 22:50:21 +01:00
|
|
|
func RegisterVndkLibraryTxtTypes(ctx android.RegistrationContext) {
|
|
|
|
ctx.RegisterModuleType("llndk_libraries_txt", VndkLibrariesTxtFactory(libclangRTRemover(llndkLibraries)))
|
|
|
|
ctx.RegisterModuleType("vndksp_libraries_txt", VndkLibrariesTxtFactory(vndkSpLibraries))
|
|
|
|
ctx.RegisterModuleType("vndkcore_libraries_txt", VndkLibrariesTxtFactory(vndkCoreLibraries))
|
|
|
|
ctx.RegisterModuleType("vndkprivate_libraries_txt", VndkLibrariesTxtFactory(vndkPrivateLibraries))
|
|
|
|
ctx.RegisterModuleType("vndkproduct_libraries_txt", VndkLibrariesTxtFactory(vndkProductLibraries))
|
|
|
|
ctx.RegisterModuleType("vndkcorevariant_libraries_txt", VndkLibrariesTxtFactory(vndkUsingCoreVariantLibraries))
|
|
|
|
}
|
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
type vndkLibrariesTxt struct {
|
|
|
|
android.ModuleBase
|
2020-12-28 22:50:21 +01:00
|
|
|
|
|
|
|
lister func(android.Config) map[string]string
|
|
|
|
properties VndkLibrariesTxtProperties
|
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
outputFile android.OutputPath
|
|
|
|
}
|
|
|
|
|
2020-12-28 22:50:21 +01:00
|
|
|
type VndkLibrariesTxtProperties struct {
|
|
|
|
Insert_vndk_version *bool
|
|
|
|
}
|
|
|
|
|
2020-06-01 19:45:49 +02:00
|
|
|
var _ etc.PrebuiltEtcModule = &vndkLibrariesTxt{}
|
2019-11-06 08:53:07 +01:00
|
|
|
var _ android.OutputFileProducer = &vndkLibrariesTxt{}
|
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
// vndk_libraries_txt is a special kind of module type in that it name is one of
|
|
|
|
// - llndk.libraries.txt
|
|
|
|
// - vndkcore.libraries.txt
|
|
|
|
// - vndksp.libraries.txt
|
|
|
|
// - vndkprivate.libraries.txt
|
2020-12-07 04:44:03 +01:00
|
|
|
// - vndkproduct.libraries.txt
|
2019-11-06 08:46:15 +01:00
|
|
|
// - vndkcorevariant.libraries.txt
|
|
|
|
// A module behaves like a prebuilt_etc but its content is generated by soong.
|
|
|
|
// By being a soong module, these files can be referenced by other soong modules.
|
|
|
|
// For example, apex_vndk can depend on these files as prebuilt.
|
2020-12-28 22:50:21 +01:00
|
|
|
func VndkLibrariesTxtFactory(lister func(android.Config) map[string]string) android.ModuleFactory {
|
|
|
|
return func() android.Module {
|
|
|
|
m := &vndkLibrariesTxt{
|
|
|
|
lister: lister,
|
|
|
|
}
|
|
|
|
m.AddProperties(&m.properties)
|
|
|
|
android.InitAndroidModule(m)
|
|
|
|
return m
|
|
|
|
}
|
2019-11-06 08:46:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func insertVndkVersion(filename string, vndkVersion string) string {
|
|
|
|
if index := strings.LastIndex(filename, "."); index != -1 {
|
|
|
|
return filename[:index] + "." + vndkVersion + filename[index:]
|
|
|
|
}
|
|
|
|
return filename
|
|
|
|
}
|
|
|
|
|
2020-12-28 22:50:21 +01:00
|
|
|
func libclangRTRemover(lister func(android.Config) map[string]string) func(android.Config) map[string]string {
|
|
|
|
return func(config android.Config) map[string]string {
|
|
|
|
libs := lister(config)
|
|
|
|
filteredLibs := make(map[string]string, len(libs))
|
|
|
|
for lib, v := range libs {
|
|
|
|
if strings.HasPrefix(lib, "libclang_rt.hwasan-") {
|
2019-11-06 08:46:15 +01:00
|
|
|
continue
|
|
|
|
}
|
2020-12-28 22:50:21 +01:00
|
|
|
filteredLibs[lib] = v
|
2019-11-06 08:46:15 +01:00
|
|
|
}
|
2020-12-28 22:50:21 +01:00
|
|
|
return filteredLibs
|
2019-11-06 08:46:15 +01:00
|
|
|
}
|
2020-12-28 22:50:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func (txt *vndkLibrariesTxt) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|
|
|
list := android.SortedStringMapValues(txt.lister(ctx.Config()))
|
2019-11-06 08:46:15 +01:00
|
|
|
|
2019-12-30 03:12:55 +01:00
|
|
|
var filename string
|
2020-12-28 22:50:21 +01:00
|
|
|
if BoolDefault(txt.properties.Insert_vndk_version, true) {
|
2019-12-30 03:12:55 +01:00
|
|
|
filename = insertVndkVersion(txt.Name(), ctx.DeviceConfig().PlatformVndkVersion())
|
|
|
|
} else {
|
|
|
|
filename = txt.Name()
|
|
|
|
}
|
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
txt.outputFile = android.PathForModuleOut(ctx, filename).OutputPath
|
2020-11-13 20:48:42 +01:00
|
|
|
android.WriteFileRule(ctx, txt.outputFile, strings.Join(list, "\n"))
|
2019-11-06 08:46:15 +01:00
|
|
|
|
|
|
|
installPath := android.PathForModuleInstall(ctx, "etc")
|
|
|
|
ctx.InstallFile(installPath, filename, txt.outputFile)
|
|
|
|
}
|
|
|
|
|
2019-12-03 05:24:29 +01:00
|
|
|
func (txt *vndkLibrariesTxt) AndroidMkEntries() []android.AndroidMkEntries {
|
|
|
|
return []android.AndroidMkEntries{android.AndroidMkEntries{
|
2019-11-06 08:46:15 +01:00
|
|
|
Class: "ETC",
|
|
|
|
OutputFile: android.OptionalPathForPath(txt.outputFile),
|
|
|
|
ExtraEntries: []android.AndroidMkExtraEntriesFunc{
|
|
|
|
func(entries *android.AndroidMkEntries) {
|
|
|
|
entries.SetString("LOCAL_MODULE_STEM", txt.outputFile.Base())
|
|
|
|
},
|
|
|
|
},
|
2019-12-03 05:24:29 +01:00
|
|
|
}}
|
2019-11-06 08:46:15 +01:00
|
|
|
}
|
|
|
|
|
2020-08-26 15:11:53 +02:00
|
|
|
// PrebuiltEtcModule interface
|
2019-11-06 08:53:07 +01:00
|
|
|
func (txt *vndkLibrariesTxt) OutputFile() android.OutputPath {
|
|
|
|
return txt.outputFile
|
|
|
|
}
|
|
|
|
|
2020-08-26 15:11:53 +02:00
|
|
|
// PrebuiltEtcModule interface
|
|
|
|
func (txt *vndkLibrariesTxt) BaseDir() string {
|
|
|
|
return "etc"
|
2019-11-06 08:53:07 +01:00
|
|
|
}
|
|
|
|
|
2020-08-26 15:11:53 +02:00
|
|
|
// PrebuiltEtcModule interface
|
2019-11-06 08:53:07 +01:00
|
|
|
func (txt *vndkLibrariesTxt) SubDir() string {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2020-08-26 15:11:53 +02:00
|
|
|
func (txt *vndkLibrariesTxt) OutputFiles(tag string) (android.Paths, error) {
|
|
|
|
return android.Paths{txt.outputFile}, nil
|
|
|
|
}
|
|
|
|
|
2019-05-09 06:29:15 +02:00
|
|
|
func VndkSnapshotSingleton() android.Singleton {
|
|
|
|
return &vndkSnapshotSingleton{}
|
|
|
|
}
|
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
type vndkSnapshotSingleton struct {
|
2019-11-06 08:53:07 +01:00
|
|
|
vndkLibrariesFile android.OutputPath
|
|
|
|
vndkSnapshotZipFile android.OptionalPath
|
2019-10-30 10:43:49 +01:00
|
|
|
}
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2020-12-02 05:14:28 +01:00
|
|
|
func isVndkSnapshotAware(config android.DeviceConfig, m *Module,
|
2020-09-16 03:30:11 +02:00
|
|
|
apexInfo android.ApexInfo) (i snapshotLibraryInterface, vndkType string, isVndkSnapshotLib bool) {
|
|
|
|
|
2020-03-03 14:06:32 +01:00
|
|
|
if m.Target().NativeBridge == android.NativeBridgeEnabled {
|
|
|
|
return nil, "", false
|
|
|
|
}
|
2020-10-20 11:54:21 +02:00
|
|
|
// !inVendor: There's product/vendor variants for VNDK libs. We only care about vendor variants.
|
|
|
|
// !installable: Snapshot only cares about "installable" modules.
|
|
|
|
// isSnapshotPrebuilt: Snapshotting a snapshot doesn't make sense.
|
2020-09-16 03:30:11 +02:00
|
|
|
if !m.inVendor() || !m.installable(apexInfo) || m.isSnapshotPrebuilt() {
|
2020-03-03 14:06:32 +01:00
|
|
|
return nil, "", false
|
|
|
|
}
|
|
|
|
l, ok := m.linker.(snapshotLibraryInterface)
|
|
|
|
if !ok || !l.shared() {
|
|
|
|
return nil, "", false
|
|
|
|
}
|
2020-12-02 15:00:51 +01:00
|
|
|
if m.VndkVersion() == config.PlatformVndkVersion() && m.IsVndk() && !m.IsVndkExt() {
|
2020-03-03 14:06:32 +01:00
|
|
|
if m.isVndkSp() {
|
|
|
|
return l, "vndk-sp", true
|
|
|
|
} else {
|
|
|
|
return l, "vndk-core", true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nil, "", false
|
|
|
|
}
|
|
|
|
|
2019-05-09 06:29:15 +02:00
|
|
|
func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
|
2019-10-30 10:43:49 +01:00
|
|
|
// build these files even if PlatformVndkVersion or BoardVndkVersion is not set
|
|
|
|
c.buildVndkLibrariesTxtFiles(ctx)
|
|
|
|
|
2019-05-09 06:29:15 +02:00
|
|
|
// BOARD_VNDK_VERSION must be set to 'current' in order to generate a VNDK snapshot.
|
|
|
|
if ctx.DeviceConfig().VndkVersion() != "current" {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if ctx.DeviceConfig().PlatformVndkVersion() == "" {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2019-10-22 13:15:20 +02:00
|
|
|
var snapshotOutputs android.Paths
|
|
|
|
|
|
|
|
/*
|
|
|
|
VNDK snapshot zipped artifacts directory structure:
|
|
|
|
{SNAPSHOT_ARCH}/
|
|
|
|
arch-{TARGET_ARCH}-{TARGET_ARCH_VARIANT}/
|
|
|
|
shared/
|
|
|
|
vndk-core/
|
|
|
|
(VNDK-core libraries, e.g. libbinder.so)
|
|
|
|
vndk-sp/
|
|
|
|
(VNDK-SP libraries, e.g. libc++.so)
|
|
|
|
arch-{TARGET_2ND_ARCH}-{TARGET_2ND_ARCH_VARIANT}/
|
|
|
|
shared/
|
|
|
|
vndk-core/
|
|
|
|
(VNDK-core libraries, e.g. libbinder.so)
|
|
|
|
vndk-sp/
|
|
|
|
(VNDK-SP libraries, e.g. libc++.so)
|
|
|
|
binder32/
|
|
|
|
(This directory is newly introduced in v28 (Android P) to hold
|
|
|
|
prebuilts built for 32-bit binder interface.)
|
|
|
|
arch-{TARGET_ARCH}-{TARGE_ARCH_VARIANT}/
|
|
|
|
...
|
|
|
|
configs/
|
|
|
|
(various *.txt configuration files)
|
|
|
|
include/
|
|
|
|
(header files of same directory structure with source tree)
|
|
|
|
NOTICE_FILES/
|
|
|
|
(notice files of libraries, e.g. libcutils.so.txt)
|
|
|
|
*/
|
2019-05-09 06:29:15 +02:00
|
|
|
|
|
|
|
snapshotDir := "vndk-snapshot"
|
2019-10-22 13:15:20 +02:00
|
|
|
snapshotArchDir := filepath.Join(snapshotDir, ctx.DeviceConfig().DeviceArch())
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2019-10-22 13:15:20 +02:00
|
|
|
configsDir := filepath.Join(snapshotArchDir, "configs")
|
|
|
|
noticeDir := filepath.Join(snapshotArchDir, "NOTICE_FILES")
|
|
|
|
includeDir := filepath.Join(snapshotArchDir, "include")
|
|
|
|
|
|
|
|
// set of notice files copied.
|
2019-05-09 06:29:15 +02:00
|
|
|
noticeBuilt := make(map[string]bool)
|
|
|
|
|
2019-10-22 13:15:20 +02:00
|
|
|
// paths of VNDK modules for GPL license checking
|
|
|
|
modulePaths := make(map[string]string)
|
|
|
|
|
|
|
|
// actual module names of .so files
|
|
|
|
// e.g. moduleNames["libprotobuf-cpp-full-3.9.1.so"] = "libprotobuf-cpp-full"
|
|
|
|
moduleNames := make(map[string]string)
|
|
|
|
|
2019-11-15 01:59:12 +01:00
|
|
|
var headers android.Paths
|
2019-05-14 11:52:49 +02:00
|
|
|
|
2020-12-02 05:14:28 +01:00
|
|
|
// installVndkSnapshotLib copies built .so file from the module.
|
|
|
|
// Also, if the build artifacts is on, write a json file which contains all exported flags
|
|
|
|
// with FlagExporterInfo.
|
2020-09-18 23:15:30 +02:00
|
|
|
installVndkSnapshotLib := func(m *Module, vndkType string) (android.Paths, bool) {
|
2019-11-15 01:59:12 +01:00
|
|
|
var ret android.Paths
|
2019-05-14 11:52:49 +02:00
|
|
|
|
2019-11-15 01:59:12 +01:00
|
|
|
targetArch := "arch-" + m.Target().Arch.ArchType.String()
|
|
|
|
if m.Target().Arch.ArchVariant != "" {
|
|
|
|
targetArch += "-" + m.Target().Arch.ArchVariant
|
2019-10-22 13:15:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
libPath := m.outputFile.Path()
|
2019-11-15 01:59:12 +01:00
|
|
|
snapshotLibOut := filepath.Join(snapshotArchDir, targetArch, "shared", vndkType, libPath.Base())
|
2020-12-02 05:14:28 +01:00
|
|
|
ret = append(ret, copyFileRule(ctx, libPath, snapshotLibOut))
|
2019-05-14 11:52:49 +02:00
|
|
|
|
|
|
|
if ctx.Config().VndkSnapshotBuildArtifacts() {
|
|
|
|
prop := struct {
|
|
|
|
ExportedDirs []string `json:",omitempty"`
|
|
|
|
ExportedSystemDirs []string `json:",omitempty"`
|
|
|
|
ExportedFlags []string `json:",omitempty"`
|
|
|
|
RelativeInstallPath string `json:",omitempty"`
|
|
|
|
}{}
|
2020-09-18 23:15:30 +02:00
|
|
|
exportedInfo := ctx.ModuleProvider(m, FlagExporterInfoProvider).(FlagExporterInfo)
|
|
|
|
prop.ExportedFlags = exportedInfo.Flags
|
|
|
|
prop.ExportedDirs = exportedInfo.IncludeDirs.Strings()
|
|
|
|
prop.ExportedSystemDirs = exportedInfo.SystemIncludeDirs.Strings()
|
2019-05-14 11:52:49 +02:00
|
|
|
prop.RelativeInstallPath = m.RelativeInstallPath()
|
|
|
|
|
2019-10-22 13:15:20 +02:00
|
|
|
propOut := snapshotLibOut + ".json"
|
2019-05-14 11:52:49 +02:00
|
|
|
|
|
|
|
j, err := json.Marshal(prop)
|
|
|
|
if err != nil {
|
|
|
|
ctx.Errorf("json marshal to %q failed: %#v", propOut, err)
|
2019-10-22 13:15:20 +02:00
|
|
|
return nil, false
|
2019-05-14 11:52:49 +02:00
|
|
|
}
|
2020-12-02 05:14:28 +01:00
|
|
|
ret = append(ret, writeStringToFileRule(ctx, string(j), propOut))
|
2019-05-14 11:52:49 +02:00
|
|
|
}
|
2019-10-22 13:15:20 +02:00
|
|
|
return ret, true
|
2019-05-14 11:52:49 +02:00
|
|
|
}
|
|
|
|
|
2019-05-09 06:29:15 +02:00
|
|
|
ctx.VisitAllModules(func(module android.Module) {
|
|
|
|
m, ok := module.(*Module)
|
2019-05-14 11:52:49 +02:00
|
|
|
if !ok || !m.Enabled() {
|
2019-05-09 06:29:15 +02:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-09-16 03:30:11 +02:00
|
|
|
apexInfo := ctx.ModuleProvider(module, android.ApexInfoProvider).(android.ApexInfo)
|
|
|
|
|
2020-12-02 05:14:28 +01:00
|
|
|
l, vndkType, ok := isVndkSnapshotAware(ctx.DeviceConfig(), m, apexInfo)
|
2019-05-14 11:52:49 +02:00
|
|
|
if !ok {
|
2019-05-20 10:39:52 +02:00
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-12-02 05:14:28 +01:00
|
|
|
// For all snapshot candidates, the followings are captured.
|
|
|
|
// - .so files
|
|
|
|
// - notice files
|
|
|
|
//
|
|
|
|
// The followings are also captured if VNDK_SNAPSHOT_BUILD_ARTIFACTS.
|
|
|
|
// - .json files containing exported flags
|
|
|
|
// - exported headers from collectHeadersForSnapshot()
|
|
|
|
//
|
|
|
|
// Headers are deduplicated after visiting all modules.
|
|
|
|
|
2019-11-15 01:59:12 +01:00
|
|
|
// install .so files for appropriate modules.
|
|
|
|
// Also install .json files if VNDK_SNAPSHOT_BUILD_ARTIFACTS
|
2020-09-18 23:15:30 +02:00
|
|
|
libs, ok := installVndkSnapshotLib(m, vndkType)
|
2019-05-14 11:52:49 +02:00
|
|
|
if !ok {
|
|
|
|
return
|
|
|
|
}
|
2019-10-22 13:15:20 +02:00
|
|
|
snapshotOutputs = append(snapshotOutputs, libs...)
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2019-11-15 01:59:12 +01:00
|
|
|
// These are for generating module_names.txt and module_paths.txt
|
|
|
|
stem := m.outputFile.Path().Base()
|
|
|
|
moduleNames[stem] = ctx.ModuleName(m)
|
|
|
|
modulePaths[stem] = ctx.ModuleDir(m)
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2020-02-19 05:21:55 +01:00
|
|
|
if len(m.NoticeFiles()) > 0 {
|
2019-11-15 01:59:12 +01:00
|
|
|
noticeName := stem + ".txt"
|
|
|
|
// skip already copied notice file
|
|
|
|
if _, ok := noticeBuilt[noticeName]; !ok {
|
|
|
|
noticeBuilt[noticeName] = true
|
2020-12-02 05:14:28 +01:00
|
|
|
snapshotOutputs = append(snapshotOutputs, combineNoticesRule(
|
2020-02-19 05:21:55 +01:00
|
|
|
ctx, m.NoticeFiles(), filepath.Join(noticeDir, noticeName)))
|
2017-08-16 07:05:54 +02:00
|
|
|
}
|
2019-05-09 06:29:15 +02:00
|
|
|
}
|
|
|
|
|
2019-11-15 01:59:12 +01:00
|
|
|
if ctx.Config().VndkSnapshotBuildArtifacts() {
|
2020-03-03 14:06:32 +01:00
|
|
|
headers = append(headers, l.snapshotHeaders()...)
|
2019-05-14 11:52:49 +02:00
|
|
|
}
|
2019-11-15 01:59:12 +01:00
|
|
|
})
|
2019-05-14 11:52:49 +02:00
|
|
|
|
2019-11-15 01:59:12 +01:00
|
|
|
// install all headers after removing duplicates
|
|
|
|
for _, header := range android.FirstUniquePaths(headers) {
|
2020-12-02 05:14:28 +01:00
|
|
|
snapshotOutputs = append(snapshotOutputs, copyFileRule(
|
2019-11-15 01:59:12 +01:00
|
|
|
ctx, header, filepath.Join(includeDir, header.String())))
|
2019-05-14 11:52:49 +02:00
|
|
|
}
|
|
|
|
|
2019-11-06 08:53:07 +01:00
|
|
|
// install *.libraries.txt except vndkcorevariant.libraries.txt
|
|
|
|
ctx.VisitAllModules(func(module android.Module) {
|
|
|
|
m, ok := module.(*vndkLibrariesTxt)
|
|
|
|
if !ok || !m.Enabled() || m.Name() == vndkUsingCoreVariantLibrariesTxt {
|
|
|
|
return
|
|
|
|
}
|
2020-12-02 05:14:28 +01:00
|
|
|
snapshotOutputs = append(snapshotOutputs, copyFileRule(
|
2019-11-15 01:59:12 +01:00
|
|
|
ctx, m.OutputFile(), filepath.Join(configsDir, m.Name())))
|
2019-11-06 08:53:07 +01:00
|
|
|
})
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2019-10-22 13:15:20 +02:00
|
|
|
/*
|
|
|
|
module_paths.txt contains paths on which VNDK modules are defined.
|
|
|
|
e.g.,
|
2020-10-26 15:34:53 +01:00
|
|
|
libbase.so system/libbase
|
2019-10-22 13:15:20 +02:00
|
|
|
libc.so bionic/libc
|
|
|
|
...
|
|
|
|
*/
|
2020-12-02 05:14:28 +01:00
|
|
|
snapshotOutputs = append(snapshotOutputs, installMapListFileRule(ctx, modulePaths, filepath.Join(configsDir, "module_paths.txt")))
|
2019-10-22 13:15:20 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
module_names.txt contains names as which VNDK modules are defined,
|
|
|
|
because output filename and module name can be different with stem and suffix properties.
|
|
|
|
|
|
|
|
e.g.,
|
|
|
|
libcutils.so libcutils
|
|
|
|
libprotobuf-cpp-full-3.9.2.so libprotobuf-cpp-full
|
|
|
|
...
|
|
|
|
*/
|
2020-12-02 05:14:28 +01:00
|
|
|
snapshotOutputs = append(snapshotOutputs, installMapListFileRule(ctx, moduleNames, filepath.Join(configsDir, "module_names.txt")))
|
2019-10-22 13:15:20 +02:00
|
|
|
|
|
|
|
// All artifacts are ready. Sort them to normalize ninja and then zip.
|
|
|
|
sort.Slice(snapshotOutputs, func(i, j int) bool {
|
|
|
|
return snapshotOutputs[i].String() < snapshotOutputs[j].String()
|
|
|
|
})
|
2019-06-04 00:26:05 +02:00
|
|
|
|
2019-10-22 13:15:20 +02:00
|
|
|
zipPath := android.PathForOutput(ctx, snapshotDir, "android-vndk-"+ctx.DeviceConfig().DeviceArch()+".zip")
|
2020-11-17 02:32:30 +01:00
|
|
|
zipRule := android.NewRuleBuilder(pctx, ctx)
|
2019-10-22 13:15:20 +02:00
|
|
|
|
2020-12-02 05:14:28 +01:00
|
|
|
// filenames in rspfile from FlagWithRspFileInputList might be single-quoted. Remove it with tr
|
2019-10-22 13:15:20 +02:00
|
|
|
snapshotOutputList := android.PathForOutput(ctx, snapshotDir, "android-vndk-"+ctx.DeviceConfig().DeviceArch()+"_list")
|
|
|
|
zipRule.Command().
|
2019-11-15 01:59:12 +01:00
|
|
|
Text("tr").
|
|
|
|
FlagWithArg("-d ", "\\'").
|
|
|
|
FlagWithRspFileInputList("< ", snapshotOutputs).
|
|
|
|
FlagWithOutput("> ", snapshotOutputList)
|
2019-10-22 13:15:20 +02:00
|
|
|
|
|
|
|
zipRule.Temporary(snapshotOutputList)
|
|
|
|
|
|
|
|
zipRule.Command().
|
2020-11-17 02:32:30 +01:00
|
|
|
BuiltTool("soong_zip").
|
2019-10-22 13:15:20 +02:00
|
|
|
FlagWithOutput("-o ", zipPath).
|
|
|
|
FlagWithArg("-C ", android.PathForOutput(ctx, snapshotDir).String()).
|
|
|
|
FlagWithInput("-l ", snapshotOutputList)
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2020-11-17 02:32:30 +01:00
|
|
|
zipRule.Build(zipPath.String(), "vndk snapshot "+zipPath.String())
|
2019-11-15 01:59:12 +01:00
|
|
|
zipRule.DeleteTemporaryFiles()
|
2019-10-22 13:15:20 +02:00
|
|
|
c.vndkSnapshotZipFile = android.OptionalPathForPath(zipPath)
|
2017-08-03 14:22:50 +02:00
|
|
|
}
|
2019-10-22 12:32:18 +02:00
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
func getVndkFileName(m *Module) (string, error) {
|
|
|
|
if library, ok := m.linker.(*libraryDecorator); ok {
|
2020-10-29 10:24:11 +01:00
|
|
|
return library.getLibNameHelper(m.BaseModuleName(), true, false) + ".so", nil
|
2019-10-30 10:43:49 +01:00
|
|
|
}
|
|
|
|
if prebuilt, ok := m.linker.(*prebuiltLibraryLinker); ok {
|
2020-10-29 10:24:11 +01:00
|
|
|
return prebuilt.libraryDecorator.getLibNameHelper(m.BaseModuleName(), true, false) + ".so", nil
|
2019-10-30 10:43:49 +01:00
|
|
|
}
|
|
|
|
return "", fmt.Errorf("VNDK library should have libraryDecorator or prebuiltLibraryLinker as linker: %T", m.linker)
|
2019-10-22 12:32:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func (c *vndkSnapshotSingleton) buildVndkLibrariesTxtFiles(ctx android.SingletonContext) {
|
2019-11-06 08:53:07 +01:00
|
|
|
llndk := android.SortedStringMapValues(llndkLibraries(ctx.Config()))
|
2019-10-30 10:43:49 +01:00
|
|
|
vndkcore := android.SortedStringMapValues(vndkCoreLibraries(ctx.Config()))
|
|
|
|
vndksp := android.SortedStringMapValues(vndkSpLibraries(ctx.Config()))
|
|
|
|
vndkprivate := android.SortedStringMapValues(vndkPrivateLibraries(ctx.Config()))
|
2020-12-07 04:44:03 +01:00
|
|
|
vndkproduct := android.SortedStringMapValues(vndkProductLibraries(ctx.Config()))
|
2019-10-30 10:43:49 +01:00
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
// Build list of vndk libs as merged & tagged & filter-out(libclang_rt):
|
2019-10-30 10:43:49 +01:00
|
|
|
// Since each target have different set of libclang_rt.* files,
|
|
|
|
// keep the common set of files in vndk.libraries.txt
|
|
|
|
var merged []string
|
2019-10-22 12:32:18 +02:00
|
|
|
filterOutLibClangRt := func(libList []string) (filtered []string) {
|
|
|
|
for _, lib := range libList {
|
|
|
|
if !strings.HasPrefix(lib, "libclang_rt.") {
|
|
|
|
filtered = append(filtered, lib)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return
|
|
|
|
}
|
|
|
|
merged = append(merged, addPrefix(filterOutLibClangRt(llndk), "LLNDK: ")...)
|
|
|
|
merged = append(merged, addPrefix(vndksp, "VNDK-SP: ")...)
|
|
|
|
merged = append(merged, addPrefix(filterOutLibClangRt(vndkcore), "VNDK-core: ")...)
|
|
|
|
merged = append(merged, addPrefix(vndkprivate, "VNDK-private: ")...)
|
2020-12-07 04:44:03 +01:00
|
|
|
merged = append(merged, addPrefix(filterOutLibClangRt(vndkproduct), "VNDK-product: ")...)
|
2019-11-06 08:53:07 +01:00
|
|
|
c.vndkLibrariesFile = android.PathForOutput(ctx, "vndk", "vndk.libraries.txt")
|
2020-11-13 20:48:42 +01:00
|
|
|
android.WriteFileRule(ctx, c.vndkLibrariesFile, strings.Join(merged, "\n"))
|
2019-10-30 10:43:49 +01:00
|
|
|
}
|
2019-10-22 12:32:18 +02:00
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
func (c *vndkSnapshotSingleton) MakeVars(ctx android.MakeVarsContext) {
|
|
|
|
// Make uses LLNDK_MOVED_TO_APEX_LIBRARIES to avoid installing libraries on /system if
|
|
|
|
// they been moved to an apex.
|
2020-09-16 03:30:11 +02:00
|
|
|
movedToApexLlndkLibraries := make(map[string]bool)
|
|
|
|
ctx.VisitAllModules(func(module android.Module) {
|
2020-12-17 01:46:01 +01:00
|
|
|
if library := moduleLibraryInterface(module); library != nil && library.hasLLNDKStubs() {
|
|
|
|
// Skip bionic libs, they are handled in different manner
|
|
|
|
name := library.implementationModuleName(module.(*Module).BaseModuleName())
|
|
|
|
if module.(android.ApexModule).DirectlyInAnyApex() && !isBionic(name) {
|
|
|
|
movedToApexLlndkLibraries[name] = true
|
2020-09-16 03:30:11 +02:00
|
|
|
}
|
2019-10-30 10:43:49 +01:00
|
|
|
}
|
2020-09-16 03:30:11 +02:00
|
|
|
})
|
|
|
|
|
|
|
|
ctx.Strict("LLNDK_MOVED_TO_APEX_LIBRARIES",
|
|
|
|
strings.Join(android.SortedStringKeys(movedToApexLlndkLibraries), " "))
|
2019-11-06 08:53:07 +01:00
|
|
|
|
|
|
|
// Make uses LLNDK_LIBRARIES to determine which libraries to install.
|
|
|
|
// HWASAN is only part of the LL-NDK in builds in which libc depends on HWASAN.
|
|
|
|
// Therefore, by removing the library here, we cause it to only be installed if libc
|
|
|
|
// depends on it.
|
|
|
|
installedLlndkLibraries := []string{}
|
|
|
|
for lib := range llndkLibraries(ctx.Config()) {
|
|
|
|
if strings.HasPrefix(lib, "libclang_rt.hwasan-") {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
installedLlndkLibraries = append(installedLlndkLibraries, lib)
|
|
|
|
}
|
|
|
|
sort.Strings(installedLlndkLibraries)
|
|
|
|
ctx.Strict("LLNDK_LIBRARIES", strings.Join(installedLlndkLibraries, " "))
|
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
ctx.Strict("VNDK_CORE_LIBRARIES", strings.Join(android.SortedStringKeys(vndkCoreLibraries(ctx.Config())), " "))
|
|
|
|
ctx.Strict("VNDK_SAMEPROCESS_LIBRARIES", strings.Join(android.SortedStringKeys(vndkSpLibraries(ctx.Config())), " "))
|
|
|
|
ctx.Strict("VNDK_PRIVATE_LIBRARIES", strings.Join(android.SortedStringKeys(vndkPrivateLibraries(ctx.Config())), " "))
|
|
|
|
ctx.Strict("VNDK_USING_CORE_VARIANT_LIBRARIES", strings.Join(android.SortedStringKeys(vndkUsingCoreVariantLibraries(ctx.Config())), " "))
|
|
|
|
|
|
|
|
ctx.Strict("VNDK_LIBRARIES_FILE", c.vndkLibrariesFile.String())
|
2019-10-22 13:15:20 +02:00
|
|
|
ctx.Strict("SOONG_VNDK_SNAPSHOT_ZIP", c.vndkSnapshotZipFile.String())
|
2019-10-22 12:32:18 +02:00
|
|
|
}
|