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 (
|
2018-10-15 14:05:27 +02:00
|
|
|
"errors"
|
2017-08-17 23:55:15 +02:00
|
|
|
"sort"
|
2017-08-03 14:22:50 +02:00
|
|
|
"strings"
|
|
|
|
"sync"
|
|
|
|
|
2017-06-23 12:24:43 +02:00
|
|
|
"android/soong/android"
|
|
|
|
)
|
|
|
|
|
|
|
|
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.
|
|
|
|
//
|
2017-08-16 07:05:54 +02:00
|
|
|
// `vendor_vailable` 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
|
|
|
|
|
|
|
// 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
|
|
|
}
|
|
|
|
|
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) vndkCheckLinkType(ctx android.ModuleContext, to *Module, tag 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() {
|
|
|
|
// Non-VNDK modules (those installed to /vendor) can't depend on modules marked with
|
|
|
|
// vendor_available: false.
|
|
|
|
violation := false
|
2017-11-07 19:57:05 +01:00
|
|
|
if lib, ok := to.linker.(*llndkStubDecorator); ok && !Bool(lib.Properties.Vendor_available) {
|
2017-08-16 07:05:54 +02:00
|
|
|
violation = true
|
|
|
|
} else {
|
|
|
|
if _, ok := to.linker.(libraryInterface); ok && to.VendorProperties.Vendor_available != nil && !Bool(to.VendorProperties.Vendor_available) {
|
|
|
|
// Vendor_available == nil && !Bool(Vendor_available) should be okay since
|
|
|
|
// it means a vendor-only library which is a valid dependency for non-VNDK
|
|
|
|
// modules.
|
|
|
|
violation = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if violation {
|
|
|
|
ctx.ModuleErrorf("Vendor module that is not VNDK should not link to %q which is marked as `vendor_available: false`", to.Name())
|
|
|
|
}
|
|
|
|
}
|
2017-06-23 12:24:43 +02:00
|
|
|
if lib, ok := to.linker.(*libraryDecorator); !ok || !lib.shared() {
|
|
|
|
// Check only shared libraries.
|
|
|
|
// Other (static and LL-NDK) libraries are allowed to link.
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !to.Properties.UseVndk {
|
|
|
|
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
|
|
|
|
}
|
|
|
|
if !Bool(to.VendorProperties.Vendor_available) {
|
|
|
|
ctx.ModuleErrorf(
|
|
|
|
"`extends` refers module %q which does not have `vendor_available: true`",
|
|
|
|
to.Name())
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
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 (
|
2017-08-16 07:05:54 +02:00
|
|
|
vndkCoreLibraries []string
|
|
|
|
vndkSpLibraries []string
|
|
|
|
llndkLibraries []string
|
|
|
|
vndkPrivateLibraries []string
|
|
|
|
vndkLibrariesLock sync.Mutex
|
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) {
|
2018-02-16 14:14:07 +01:00
|
|
|
if m, ok := mctx.Module().(*Module); ok && m.Enabled() {
|
2017-08-16 07:05:54 +02:00
|
|
|
if lib, ok := m.linker.(*llndkStubDecorator); ok {
|
2017-08-03 14:22:50 +02:00
|
|
|
vndkLibrariesLock.Lock()
|
|
|
|
defer vndkLibrariesLock.Unlock()
|
|
|
|
name := strings.TrimSuffix(m.Name(), llndkLibrarySuffix)
|
|
|
|
if !inList(name, llndkLibraries) {
|
|
|
|
llndkLibraries = append(llndkLibraries, name)
|
2017-08-17 23:55:15 +02:00
|
|
|
sort.Strings(llndkLibraries)
|
2017-08-03 14:22:50 +02:00
|
|
|
}
|
2017-11-07 19:57:05 +01:00
|
|
|
if !Bool(lib.Properties.Vendor_available) {
|
2017-08-16 07:05:54 +02:00
|
|
|
if !inList(name, vndkPrivateLibraries) {
|
|
|
|
vndkPrivateLibraries = append(vndkPrivateLibraries, name)
|
|
|
|
sort.Strings(vndkPrivateLibraries)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
lib, is_lib := m.linker.(*libraryDecorator)
|
|
|
|
prebuilt_lib, is_prebuilt_lib := m.linker.(*prebuiltLibraryLinker)
|
|
|
|
if (is_lib && lib.shared()) || (is_prebuilt_lib && prebuilt_lib.shared()) {
|
|
|
|
name := strings.TrimPrefix(m.Name(), "prebuilt_")
|
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 m.vndkdep.isVndk() && !m.vndkdep.isVndkExt() {
|
2017-08-16 07:05:54 +02:00
|
|
|
vndkLibrariesLock.Lock()
|
|
|
|
defer vndkLibrariesLock.Unlock()
|
|
|
|
if m.vndkdep.isVndkSp() {
|
|
|
|
if !inList(name, vndkSpLibraries) {
|
|
|
|
vndkSpLibraries = append(vndkSpLibraries, name)
|
|
|
|
sort.Strings(vndkSpLibraries)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if !inList(name, vndkCoreLibraries) {
|
|
|
|
vndkCoreLibraries = append(vndkCoreLibraries, name)
|
|
|
|
sort.Strings(vndkCoreLibraries)
|
|
|
|
}
|
2017-08-03 14:22:50 +02:00
|
|
|
}
|
2017-08-16 07:05:54 +02:00
|
|
|
if !Bool(m.VendorProperties.Vendor_available) {
|
|
|
|
if !inList(name, vndkPrivateLibraries) {
|
|
|
|
vndkPrivateLibraries = append(vndkPrivateLibraries, name)
|
|
|
|
sort.Strings(vndkPrivateLibraries)
|
|
|
|
}
|
2017-08-03 14:22:50 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|