2017-11-17 19:55:38 +01: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.
|
|
|
|
|
2015-04-28 22:30:13 +02:00
|
|
|
package cc
|
|
|
|
|
|
|
|
import (
|
2017-09-28 02:05:30 +02:00
|
|
|
"fmt"
|
Squash vendor sources before linkageMutator runs
linkageMutator removes srcs property of the shared variant of a lib in
order to reuse *.o files compiled for the static variant also to the
shared variant.
However, this causes problem when vendor-specific srcs are specified in
target: {vendor: {srcs: ["..."]}}. For example, let's assume
cc_library {
name: "libfoo",
srcs: ["foo.c"],
target: {
vendor: {
srcs: ["bar.c"],
},
},
}
Then,
static_vendor: inputs = foo.o, bar.o
shared_vendor: inputs = foo.o (from static_vendor), bar.o (from
static_vendor), bar.o
So, bar.o is included twice and this causes multiple symbol definition
error.
In order to handle the problem, vendor mutator is applied before the
linkage mutator and the vendor-specific srcs are squashed in the vendor
mutator.
Bug: 67731122
Test: build
Test: cc_test.go
Change-Id: I2a5390295dddfc41260e9b6f02746908cdf47228
2017-10-12 16:05:00 +02:00
|
|
|
"io/ioutil"
|
|
|
|
"os"
|
2019-05-09 06:29:15 +02:00
|
|
|
"path/filepath"
|
2015-04-28 22:30:13 +02:00
|
|
|
"reflect"
|
2017-09-28 02:05:30 +02:00
|
|
|
"strings"
|
2015-04-28 22:30:13 +02:00
|
|
|
"testing"
|
2019-09-24 23:55:04 +02:00
|
|
|
|
|
|
|
"android/soong/android"
|
2015-04-28 22:30:13 +02:00
|
|
|
)
|
|
|
|
|
Squash vendor sources before linkageMutator runs
linkageMutator removes srcs property of the shared variant of a lib in
order to reuse *.o files compiled for the static variant also to the
shared variant.
However, this causes problem when vendor-specific srcs are specified in
target: {vendor: {srcs: ["..."]}}. For example, let's assume
cc_library {
name: "libfoo",
srcs: ["foo.c"],
target: {
vendor: {
srcs: ["bar.c"],
},
},
}
Then,
static_vendor: inputs = foo.o, bar.o
shared_vendor: inputs = foo.o (from static_vendor), bar.o (from
static_vendor), bar.o
So, bar.o is included twice and this causes multiple symbol definition
error.
In order to handle the problem, vendor mutator is applied before the
linkage mutator and the vendor-specific srcs are squashed in the vendor
mutator.
Bug: 67731122
Test: build
Test: cc_test.go
Change-Id: I2a5390295dddfc41260e9b6f02746908cdf47228
2017-10-12 16:05:00 +02:00
|
|
|
var buildDir string
|
|
|
|
|
|
|
|
func setUp() {
|
|
|
|
var err error
|
|
|
|
buildDir, err = ioutil.TempDir("", "soong_cc_test")
|
|
|
|
if err != nil {
|
|
|
|
panic(err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func tearDown() {
|
|
|
|
os.RemoveAll(buildDir)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMain(m *testing.M) {
|
|
|
|
run := func() int {
|
|
|
|
setUp()
|
|
|
|
defer tearDown()
|
|
|
|
|
|
|
|
return m.Run()
|
|
|
|
}
|
|
|
|
|
|
|
|
os.Exit(run())
|
|
|
|
}
|
|
|
|
|
2019-12-14 05:41:13 +01:00
|
|
|
func testCcWithConfig(t *testing.T, config android.Config) *android.TestContext {
|
2019-09-24 23:55:04 +02:00
|
|
|
t.Helper()
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx := CreateTestContext(config)
|
|
|
|
ctx.Register()
|
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-08-09 02:46:01 +02:00
|
|
|
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
2018-03-12 09:29:17 +01:00
|
|
|
android.FailIfErrored(t, errs)
|
2017-09-28 02:05:30 +02:00
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
2018-03-12 09:29:17 +01:00
|
|
|
android.FailIfErrored(t, errs)
|
2017-09-28 02:05:30 +02:00
|
|
|
|
|
|
|
return ctx
|
|
|
|
}
|
|
|
|
|
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 testCc(t *testing.T, bp string) *android.TestContext {
|
2018-03-29 08:08:15 +02:00
|
|
|
t.Helper()
|
2019-12-14 05:41:13 +01:00
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
2018-03-13 02:06:05 +01:00
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
2020-12-07 04:44:03 +01:00
|
|
|
config.TestProductVariables.ProductVndkVersion = StringPtr("current")
|
2018-03-13 02:06:05 +01:00
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
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
|
|
|
|
2019-12-14 05:41:13 +01:00
|
|
|
return testCcWithConfig(t, config)
|
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 testCcNoVndk(t *testing.T, bp string) *android.TestContext {
|
2018-03-29 08:08:15 +02:00
|
|
|
t.Helper()
|
2019-12-14 05:41:13 +01:00
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
2018-03-13 02:06:05 +01:00
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
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
|
|
|
|
2019-12-14 05:41:13 +01:00
|
|
|
return testCcWithConfig(t, config)
|
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
|
|
|
}
|
|
|
|
|
2020-12-07 04:44:03 +01:00
|
|
|
func testCcNoProductVndk(t *testing.T, bp string) *android.TestContext {
|
|
|
|
t.Helper()
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
|
|
|
|
return testCcWithConfig(t, config)
|
|
|
|
}
|
|
|
|
|
2019-11-18 11:52:14 +01:00
|
|
|
func testCcErrorWithConfig(t *testing.T, pattern string, config android.Config) {
|
2018-03-29 08:08:15 +02:00
|
|
|
t.Helper()
|
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
|
|
|
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx := CreateTestContext(config)
|
|
|
|
ctx.Register()
|
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
|
|
|
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
|
|
|
if len(errs) > 0 {
|
2018-03-12 09:34:26 +01:00
|
|
|
android.FailIfNoMatchingErrors(t, pattern, errs)
|
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
|
|
|
|
}
|
|
|
|
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
if len(errs) > 0 {
|
2018-03-12 09:34:26 +01:00
|
|
|
android.FailIfNoMatchingErrors(t, pattern, errs)
|
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
|
|
|
|
}
|
|
|
|
|
|
|
|
t.Fatalf("missing expected error %q (0 errors are returned)", pattern)
|
|
|
|
}
|
|
|
|
|
2019-11-18 11:52:14 +01:00
|
|
|
func testCcError(t *testing.T, pattern string, bp string) {
|
2020-10-19 11:51:07 +02:00
|
|
|
t.Helper()
|
2019-11-18 11:52:14 +01:00
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
testCcErrorWithConfig(t, pattern, config)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
func testCcErrorProductVndk(t *testing.T, pattern string, bp string) {
|
2020-10-20 11:54:21 +02:00
|
|
|
t.Helper()
|
2019-11-18 11:52:14 +01:00
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.ProductVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
testCcErrorWithConfig(t, pattern, config)
|
|
|
|
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
|
|
|
const (
|
2019-11-21 01:39:12 +01:00
|
|
|
coreVariant = "android_arm64_armv8-a_shared"
|
2019-11-21 02:12:35 +01:00
|
|
|
vendorVariant = "android_vendor.VER_arm64_armv8-a_shared"
|
2019-11-18 11:52:14 +01:00
|
|
|
productVariant = "android_product.VER_arm64_armv8-a_shared"
|
2019-11-21 02:12:35 +01:00
|
|
|
recoveryVariant = "android_recovery_arm64_armv8-a_shared"
|
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
|
|
|
)
|
|
|
|
|
2019-01-17 23:44:05 +01:00
|
|
|
func TestFuchsiaDeps(t *testing.T) {
|
|
|
|
t.Helper()
|
|
|
|
|
|
|
|
bp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libTest",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
target: {
|
|
|
|
fuchsia: {
|
|
|
|
srcs: ["bar.c"],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}`
|
|
|
|
|
2019-12-14 05:41:13 +01:00
|
|
|
config := TestConfig(buildDir, android.Fuchsia, nil, bp, nil)
|
|
|
|
ctx := testCcWithConfig(t, config)
|
2019-01-17 23:44:05 +01:00
|
|
|
|
|
|
|
rt := false
|
|
|
|
fb := false
|
|
|
|
|
|
|
|
ld := ctx.ModuleForTests("libTest", "fuchsia_arm64_shared").Rule("ld")
|
|
|
|
implicits := ld.Implicits
|
|
|
|
for _, lib := range implicits {
|
|
|
|
if strings.Contains(lib.Rel(), "libcompiler_rt") {
|
|
|
|
rt = true
|
|
|
|
}
|
|
|
|
|
|
|
|
if strings.Contains(lib.Rel(), "libbioniccompat") {
|
|
|
|
fb = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if !rt || !fb {
|
|
|
|
t.Errorf("fuchsia libs must link libcompiler_rt and libbioniccompat")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestFuchsiaTargetDecl(t *testing.T) {
|
|
|
|
t.Helper()
|
|
|
|
|
|
|
|
bp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libTest",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
target: {
|
|
|
|
fuchsia: {
|
|
|
|
srcs: ["bar.c"],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}`
|
|
|
|
|
2019-12-14 05:41:13 +01:00
|
|
|
config := TestConfig(buildDir, android.Fuchsia, nil, bp, nil)
|
|
|
|
ctx := testCcWithConfig(t, config)
|
2019-01-17 23:44:05 +01:00
|
|
|
ld := ctx.ModuleForTests("libTest", "fuchsia_arm64_shared").Rule("ld")
|
|
|
|
var objs []string
|
|
|
|
for _, o := range ld.Inputs {
|
|
|
|
objs = append(objs, o.Base())
|
|
|
|
}
|
|
|
|
if len(objs) != 2 || objs[0] != "foo.o" || objs[1] != "bar.o" {
|
|
|
|
t.Errorf("inputs of libTest must be []string{\"foo.o\", \"bar.o\"}, but was %#v.", objs)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-28 02:05:30 +02:00
|
|
|
func TestVendorSrc(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libTest",
|
|
|
|
srcs: ["foo.c"],
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
nocrt: true,
|
|
|
|
system_shared_libs: [],
|
2017-09-28 02:05:30 +02:00
|
|
|
vendor_available: true,
|
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
srcs: ["bar.c"],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
Squash vendor sources before linkageMutator runs
linkageMutator removes srcs property of the shared variant of a lib in
order to reuse *.o files compiled for the static variant also to the
shared variant.
However, this causes problem when vendor-specific srcs are specified in
target: {vendor: {srcs: ["..."]}}. For example, let's assume
cc_library {
name: "libfoo",
srcs: ["foo.c"],
target: {
vendor: {
srcs: ["bar.c"],
},
},
}
Then,
static_vendor: inputs = foo.o, bar.o
shared_vendor: inputs = foo.o (from static_vendor), bar.o (from
static_vendor), bar.o
So, bar.o is included twice and this causes multiple symbol definition
error.
In order to handle the problem, vendor mutator is applied before the
linkage mutator and the vendor-specific srcs are squashed in the vendor
mutator.
Bug: 67731122
Test: build
Test: cc_test.go
Change-Id: I2a5390295dddfc41260e9b6f02746908cdf47228
2017-10-12 16:05:00 +02:00
|
|
|
`)
|
|
|
|
|
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
|
|
|
ld := ctx.ModuleForTests("libTest", vendorVariant).Rule("ld")
|
Squash vendor sources before linkageMutator runs
linkageMutator removes srcs property of the shared variant of a lib in
order to reuse *.o files compiled for the static variant also to the
shared variant.
However, this causes problem when vendor-specific srcs are specified in
target: {vendor: {srcs: ["..."]}}. For example, let's assume
cc_library {
name: "libfoo",
srcs: ["foo.c"],
target: {
vendor: {
srcs: ["bar.c"],
},
},
}
Then,
static_vendor: inputs = foo.o, bar.o
shared_vendor: inputs = foo.o (from static_vendor), bar.o (from
static_vendor), bar.o
So, bar.o is included twice and this causes multiple symbol definition
error.
In order to handle the problem, vendor mutator is applied before the
linkage mutator and the vendor-specific srcs are squashed in the vendor
mutator.
Bug: 67731122
Test: build
Test: cc_test.go
Change-Id: I2a5390295dddfc41260e9b6f02746908cdf47228
2017-10-12 16:05:00 +02:00
|
|
|
var objs []string
|
|
|
|
for _, o := range ld.Inputs {
|
|
|
|
objs = append(objs, o.Base())
|
|
|
|
}
|
2018-01-03 22:40:46 +01:00
|
|
|
if len(objs) != 2 || objs[0] != "foo.o" || objs[1] != "bar.o" {
|
Squash vendor sources before linkageMutator runs
linkageMutator removes srcs property of the shared variant of a lib in
order to reuse *.o files compiled for the static variant also to the
shared variant.
However, this causes problem when vendor-specific srcs are specified in
target: {vendor: {srcs: ["..."]}}. For example, let's assume
cc_library {
name: "libfoo",
srcs: ["foo.c"],
target: {
vendor: {
srcs: ["bar.c"],
},
},
}
Then,
static_vendor: inputs = foo.o, bar.o
shared_vendor: inputs = foo.o (from static_vendor), bar.o (from
static_vendor), bar.o
So, bar.o is included twice and this causes multiple symbol definition
error.
In order to handle the problem, vendor mutator is applied before the
linkage mutator and the vendor-specific srcs are squashed in the vendor
mutator.
Bug: 67731122
Test: build
Test: cc_test.go
Change-Id: I2a5390295dddfc41260e9b6f02746908cdf47228
2017-10-12 16:05:00 +02:00
|
|
|
t.Errorf("inputs of libTest must be []string{\"foo.o\", \"bar.o\"}, but was %#v.", objs)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 checkVndkModule(t *testing.T, ctx *android.TestContext, name, subDir string,
|
2020-02-28 07:07:59 +01:00
|
|
|
isVndkSp bool, extends string, variant string) {
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
|
2018-03-29 08:08:15 +02:00
|
|
|
t.Helper()
|
|
|
|
|
2020-02-28 07:07:59 +01:00
|
|
|
mod := ctx.ModuleForTests(name, variant).Module().(*Module)
|
2019-10-18 23:49:46 +02:00
|
|
|
if !mod.HasVendorVariant() {
|
2020-02-28 07:07:59 +01:00
|
|
|
t.Errorf("%q must have variant %q", name, variant)
|
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
|
|
|
}
|
|
|
|
|
|
|
|
// Check library properties.
|
|
|
|
lib, ok := mod.compiler.(*libraryDecorator)
|
|
|
|
if !ok {
|
|
|
|
t.Errorf("%q must have libraryDecorator", name)
|
|
|
|
} else if lib.baseInstaller.subDir != subDir {
|
|
|
|
t.Errorf("%q must use %q as subdir but it is using %q", name, subDir,
|
|
|
|
lib.baseInstaller.subDir)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check VNDK properties.
|
|
|
|
if mod.vndkdep == nil {
|
|
|
|
t.Fatalf("%q must have `vndkdep`", name)
|
|
|
|
}
|
2019-10-18 23:49:46 +02:00
|
|
|
if !mod.IsVndk() {
|
|
|
|
t.Errorf("%q IsVndk() must equal to true", name)
|
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 mod.isVndkSp() != isVndkSp {
|
|
|
|
t.Errorf("%q isVndkSp() must equal to %t", name, isVndkSp)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check VNDK extension properties.
|
|
|
|
isVndkExt := extends != ""
|
2020-12-02 15:00:51 +01:00
|
|
|
if mod.IsVndkExt() != isVndkExt {
|
|
|
|
t.Errorf("%q IsVndkExt() must equal to %t", name, isVndkExt)
|
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 actualExtends := mod.getVndkExtendsModuleName(); actualExtends != extends {
|
|
|
|
t.Errorf("%q must extend from %q but get %q", name, extends, actualExtends)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-01 01:07:58 +02:00
|
|
|
func checkSnapshotIncludeExclude(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string, include bool) {
|
|
|
|
t.Helper()
|
2019-11-06 08:53:07 +01:00
|
|
|
mod, ok := ctx.ModuleForTests(moduleName, variant).Module().(android.OutputFileProducer)
|
|
|
|
if !ok {
|
|
|
|
t.Errorf("%q must have output\n", moduleName)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
outputFiles, err := mod.OutputFiles("")
|
|
|
|
if err != nil || len(outputFiles) != 1 {
|
|
|
|
t.Errorf("%q must have single output\n", moduleName)
|
2019-05-09 06:29:15 +02:00
|
|
|
return
|
|
|
|
}
|
2019-11-06 08:53:07 +01:00
|
|
|
snapshotPath := filepath.Join(subDir, snapshotFilename)
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2020-09-01 01:07:58 +02:00
|
|
|
if include {
|
|
|
|
out := singleton.Output(snapshotPath)
|
|
|
|
if out.Input.String() != outputFiles[0].String() {
|
|
|
|
t.Errorf("The input of snapshot %q must be %q, but %q", moduleName, out.Input.String(), outputFiles[0])
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
out := singleton.MaybeOutput(snapshotPath)
|
|
|
|
if out.Rule != nil {
|
|
|
|
t.Errorf("There must be no rule for module %q output file %q", moduleName, outputFiles[0])
|
|
|
|
}
|
2019-05-09 06:29:15 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-01 01:07:58 +02:00
|
|
|
func checkSnapshot(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string) {
|
|
|
|
checkSnapshotIncludeExclude(t, ctx, singleton, moduleName, snapshotFilename, subDir, variant, true)
|
|
|
|
}
|
|
|
|
|
|
|
|
func checkSnapshotExclude(t *testing.T, ctx *android.TestContext, singleton android.TestingSingleton, moduleName, snapshotFilename, subDir, variant string) {
|
|
|
|
checkSnapshotIncludeExclude(t, ctx, singleton, moduleName, snapshotFilename, subDir, variant, false)
|
|
|
|
}
|
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
func checkWriteFileOutput(t *testing.T, params android.TestingBuildParams, expected []string) {
|
|
|
|
t.Helper()
|
2020-11-13 20:48:42 +01:00
|
|
|
content := android.ContentFromFileRuleForTests(t, params)
|
|
|
|
actual := strings.FieldsFunc(content, func(r rune) bool { return r == '\n' })
|
2019-11-06 08:46:15 +01:00
|
|
|
assertArrayString(t, actual, expected)
|
|
|
|
}
|
|
|
|
|
2019-10-22 12:32:18 +02:00
|
|
|
func checkVndkOutput(t *testing.T, ctx *android.TestContext, output string, expected []string) {
|
|
|
|
t.Helper()
|
|
|
|
vndkSnapshot := ctx.SingletonForTests("vndk-snapshot")
|
2019-11-06 08:46:15 +01:00
|
|
|
checkWriteFileOutput(t, vndkSnapshot.Output(output), expected)
|
|
|
|
}
|
|
|
|
|
|
|
|
func checkVndkLibrariesOutput(t *testing.T, ctx *android.TestContext, module string, expected []string) {
|
|
|
|
t.Helper()
|
|
|
|
vndkLibraries := ctx.ModuleForTests(module, "")
|
2019-12-30 03:12:55 +01:00
|
|
|
|
|
|
|
var output string
|
|
|
|
if module != "vndkcorevariant.libraries.txt" {
|
|
|
|
output = insertVndkVersion(module, "VER")
|
|
|
|
} else {
|
|
|
|
output = module
|
|
|
|
}
|
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
checkWriteFileOutput(t, vndkLibraries.Output(output), expected)
|
2019-10-22 12:32:18 +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 TestVndk(t *testing.T) {
|
2019-12-14 05:41:13 +01:00
|
|
|
bp := `
|
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
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_private",
|
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
|
|
|
vendor_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
},
|
|
|
|
nocrt: true,
|
2019-10-30 10:43:49 +01:00
|
|
|
stem: "libvndk-private",
|
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
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
2020-10-29 10:24:11 +01:00
|
|
|
name: "libvndk_product",
|
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
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-10-29 10:24:11 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
cflags: ["-DTEST"],
|
|
|
|
},
|
|
|
|
product: {
|
|
|
|
cflags: ["-DTEST"],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
2019-10-30 10:43:49 +01:00
|
|
|
suffix: "-x",
|
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
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_private",
|
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
|
|
|
vendor_available: true,
|
2020-10-29 10:24:11 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
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
|
|
|
private: true,
|
2020-10-29 10:24:11 +01:00
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
suffix: "-x",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_product_private",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
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
|
|
|
private: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
},
|
|
|
|
nocrt: true,
|
2019-10-30 10:43:49 +01:00
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
suffix: "-x",
|
|
|
|
},
|
2020-10-29 10:24:11 +01:00
|
|
|
product: {
|
|
|
|
suffix: "-x",
|
|
|
|
},
|
2019-10-30 10:43:49 +01: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
|
|
|
}
|
2020-10-29 10:24:11 +01:00
|
|
|
|
2020-12-28 22:50:21 +01:00
|
|
|
llndk_libraries_txt {
|
2019-11-06 08:46:15 +01:00
|
|
|
name: "llndk.libraries.txt",
|
|
|
|
}
|
2020-12-28 22:50:21 +01:00
|
|
|
vndkcore_libraries_txt {
|
2019-11-06 08:46:15 +01:00
|
|
|
name: "vndkcore.libraries.txt",
|
|
|
|
}
|
2020-12-28 22:50:21 +01:00
|
|
|
vndksp_libraries_txt {
|
2019-11-06 08:46:15 +01:00
|
|
|
name: "vndksp.libraries.txt",
|
|
|
|
}
|
2020-12-28 22:50:21 +01:00
|
|
|
vndkprivate_libraries_txt {
|
2019-11-06 08:46:15 +01:00
|
|
|
name: "vndkprivate.libraries.txt",
|
|
|
|
}
|
2020-12-28 22:50:21 +01:00
|
|
|
vndkproduct_libraries_txt {
|
2020-12-07 04:44:03 +01:00
|
|
|
name: "vndkproduct.libraries.txt",
|
|
|
|
}
|
2020-12-28 22:50:21 +01:00
|
|
|
vndkcorevariant_libraries_txt {
|
2019-11-06 08:46:15 +01:00
|
|
|
name: "vndkcorevariant.libraries.txt",
|
2020-12-28 22:50:21 +01:00
|
|
|
insert_vndk_version: false,
|
2019-11-06 08:46:15 +01:00
|
|
|
}
|
2019-12-14 05:41:13 +01:00
|
|
|
`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
2020-10-29 08:49:43 +01:00
|
|
|
config.TestProductVariables.ProductVndkVersion = StringPtr("current")
|
2019-12-14 05:41:13 +01:00
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
|
|
|
|
ctx := testCcWithConfig(t, config)
|
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
|
|
|
|
2020-10-20 11:54:21 +02:00
|
|
|
// subdir == "" because VNDK libs are not supposed to be installed separately.
|
|
|
|
// They are installed as part of VNDK APEX instead.
|
|
|
|
checkVndkModule(t, ctx, "libvndk", "", false, "", vendorVariant)
|
|
|
|
checkVndkModule(t, ctx, "libvndk_private", "", false, "", vendorVariant)
|
2020-10-29 10:24:11 +01:00
|
|
|
checkVndkModule(t, ctx, "libvndk_product", "", false, "", vendorVariant)
|
2020-10-20 11:54:21 +02:00
|
|
|
checkVndkModule(t, ctx, "libvndk_sp", "", true, "", vendorVariant)
|
|
|
|
checkVndkModule(t, ctx, "libvndk_sp_private", "", true, "", vendorVariant)
|
2020-10-29 10:24:11 +01:00
|
|
|
checkVndkModule(t, ctx, "libvndk_sp_product_private", "", true, "", vendorVariant)
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2020-10-29 10:24:11 +01:00
|
|
|
checkVndkModule(t, ctx, "libvndk_product", "", false, "", productVariant)
|
|
|
|
checkVndkModule(t, ctx, "libvndk_sp_product_private", "", true, "", productVariant)
|
2020-10-29 08:49:43 +01:00
|
|
|
|
2019-05-09 06:29:15 +02:00
|
|
|
// Check VNDK snapshot output.
|
|
|
|
snapshotDir := "vndk-snapshot"
|
|
|
|
snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64")
|
|
|
|
|
|
|
|
vndkLibPath := filepath.Join(snapshotVariantPath, fmt.Sprintf("arch-%s-%s",
|
|
|
|
"arm64", "armv8-a"))
|
|
|
|
vndkLib2ndPath := filepath.Join(snapshotVariantPath, fmt.Sprintf("arch-%s-%s",
|
|
|
|
"arm", "armv7-a-neon"))
|
|
|
|
|
|
|
|
vndkCoreLibPath := filepath.Join(vndkLibPath, "shared", "vndk-core")
|
|
|
|
vndkSpLibPath := filepath.Join(vndkLibPath, "shared", "vndk-sp")
|
|
|
|
vndkCoreLib2ndPath := filepath.Join(vndkLib2ndPath, "shared", "vndk-core")
|
|
|
|
vndkSpLib2ndPath := filepath.Join(vndkLib2ndPath, "shared", "vndk-sp")
|
|
|
|
|
2019-11-21 02:12:35 +01:00
|
|
|
variant := "android_vendor.VER_arm64_armv8-a_shared"
|
|
|
|
variant2nd := "android_vendor.VER_arm_armv7-a-neon_shared"
|
2019-05-09 06:29:15 +02:00
|
|
|
|
2020-06-01 14:53:49 +02:00
|
|
|
snapshotSingleton := ctx.SingletonForTests("vndk-snapshot")
|
|
|
|
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.so", vndkCoreLibPath, variant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.so", vndkCoreLib2ndPath, variant2nd)
|
2020-10-29 10:24:11 +01:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk_product", "libvndk_product.so", vndkCoreLibPath, variant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk_product", "libvndk_product.so", vndkCoreLib2ndPath, variant2nd)
|
2020-06-01 14:53:49 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk_sp", "libvndk_sp-x.so", vndkSpLibPath, variant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk_sp", "libvndk_sp-x.so", vndkSpLib2ndPath, variant2nd)
|
2019-11-06 08:53:07 +01:00
|
|
|
|
|
|
|
snapshotConfigsPath := filepath.Join(snapshotVariantPath, "configs")
|
2020-06-01 14:53:49 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "llndk.libraries.txt", "llndk.libraries.txt", snapshotConfigsPath, "")
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "vndkcore.libraries.txt", "vndkcore.libraries.txt", snapshotConfigsPath, "")
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "vndksp.libraries.txt", "vndksp.libraries.txt", snapshotConfigsPath, "")
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "vndkprivate.libraries.txt", "vndkprivate.libraries.txt", snapshotConfigsPath, "")
|
2020-12-07 04:44:03 +01:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "vndkproduct.libraries.txt", "vndkproduct.libraries.txt", snapshotConfigsPath, "")
|
2019-10-22 12:32:18 +02:00
|
|
|
|
|
|
|
checkVndkOutput(t, ctx, "vndk/vndk.libraries.txt", []string{
|
|
|
|
"LLNDK: libc.so",
|
|
|
|
"LLNDK: libdl.so",
|
|
|
|
"LLNDK: libft2.so",
|
|
|
|
"LLNDK: libm.so",
|
|
|
|
"VNDK-SP: libc++.so",
|
2019-10-30 10:43:49 +01:00
|
|
|
"VNDK-SP: libvndk_sp-x.so",
|
|
|
|
"VNDK-SP: libvndk_sp_private-x.so",
|
2020-10-29 10:24:11 +01:00
|
|
|
"VNDK-SP: libvndk_sp_product_private-x.so",
|
2019-10-30 10:43:49 +01:00
|
|
|
"VNDK-core: libvndk-private.so",
|
2019-10-22 12:32:18 +02:00
|
|
|
"VNDK-core: libvndk.so",
|
2020-10-29 10:24:11 +01:00
|
|
|
"VNDK-core: libvndk_product.so",
|
2019-10-22 12:32:18 +02:00
|
|
|
"VNDK-private: libft2.so",
|
2019-10-30 10:43:49 +01:00
|
|
|
"VNDK-private: libvndk-private.so",
|
|
|
|
"VNDK-private: libvndk_sp_private-x.so",
|
2020-10-29 10:24:11 +01:00
|
|
|
"VNDK-private: libvndk_sp_product_private-x.so",
|
2020-12-07 04:44:03 +01:00
|
|
|
"VNDK-product: libc++.so",
|
|
|
|
"VNDK-product: libvndk_product.so",
|
|
|
|
"VNDK-product: libvndk_sp_product_private-x.so",
|
2019-10-30 10:43:49 +01:00
|
|
|
})
|
2019-11-06 08:46:15 +01:00
|
|
|
checkVndkLibrariesOutput(t, ctx, "llndk.libraries.txt", []string{"libc.so", "libdl.so", "libft2.so", "libm.so"})
|
2020-10-29 10:24:11 +01:00
|
|
|
checkVndkLibrariesOutput(t, ctx, "vndkcore.libraries.txt", []string{"libvndk-private.so", "libvndk.so", "libvndk_product.so"})
|
|
|
|
checkVndkLibrariesOutput(t, ctx, "vndksp.libraries.txt", []string{"libc++.so", "libvndk_sp-x.so", "libvndk_sp_private-x.so", "libvndk_sp_product_private-x.so"})
|
|
|
|
checkVndkLibrariesOutput(t, ctx, "vndkprivate.libraries.txt", []string{"libft2.so", "libvndk-private.so", "libvndk_sp_private-x.so", "libvndk_sp_product_private-x.so"})
|
2020-12-07 04:44:03 +01:00
|
|
|
checkVndkLibrariesOutput(t, ctx, "vndkproduct.libraries.txt", []string{"libc++.so", "libvndk_product.so", "libvndk_sp_product_private-x.so"})
|
2019-11-06 08:46:15 +01:00
|
|
|
checkVndkLibrariesOutput(t, ctx, "vndkcorevariant.libraries.txt", nil)
|
|
|
|
}
|
|
|
|
|
2020-06-09 10:15:37 +02:00
|
|
|
func TestVndkWithHostSupported(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_host_supported",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-06-09 10:15:37 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_host_supported_but_disabled_on_device",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-06-09 10:15:37 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
host_supported: true,
|
|
|
|
enabled: false,
|
|
|
|
target: {
|
|
|
|
host: {
|
|
|
|
enabled: true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-28 22:50:21 +01:00
|
|
|
vndkcore_libraries_txt {
|
2020-06-09 10:15:37 +02:00
|
|
|
name: "vndkcore.libraries.txt",
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
checkVndkLibrariesOutput(t, ctx, "vndkcore.libraries.txt", []string{"libvndk_host_supported.so"})
|
|
|
|
}
|
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
func TestVndkLibrariesTxtAndroidMk(t *testing.T) {
|
2019-12-14 05:41:13 +01:00
|
|
|
bp := `
|
2020-12-28 22:50:21 +01:00
|
|
|
llndk_libraries_txt {
|
2019-11-06 08:46:15 +01:00
|
|
|
name: "llndk.libraries.txt",
|
2020-12-28 22:50:21 +01:00
|
|
|
insert_vndk_version: true,
|
2019-12-14 05:41:13 +01:00
|
|
|
}`
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
ctx := testCcWithConfig(t, config)
|
2019-11-06 08:46:15 +01:00
|
|
|
|
|
|
|
module := ctx.ModuleForTests("llndk.libraries.txt", "")
|
2019-12-03 05:24:29 +01:00
|
|
|
entries := android.AndroidMkEntriesForTest(t, config, "", module.Module())[0]
|
2019-11-06 08:46:15 +01:00
|
|
|
assertArrayString(t, entries.EntryMap["LOCAL_MODULE_STEM"], []string{"llndk.libraries.VER.txt"})
|
2019-10-22 12:32:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestVndkUsingCoreVariant(t *testing.T) {
|
2019-12-14 05:41:13 +01:00
|
|
|
bp := `
|
2019-10-22 12:32:18 +02:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-10-22 12:32:18 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-10-22 12:32:18 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk2",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
2019-10-22 12:32:18 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
2019-10-22 12:32:18 +02:00
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2019-11-06 08:46:15 +01:00
|
|
|
|
2020-12-28 22:50:21 +01:00
|
|
|
vndkcorevariant_libraries_txt {
|
2019-11-06 08:46:15 +01:00
|
|
|
name: "vndkcorevariant.libraries.txt",
|
2020-12-28 22:50:21 +01:00
|
|
|
insert_vndk_version: false,
|
2019-11-06 08:46:15 +01:00
|
|
|
}
|
2019-12-14 05:41:13 +01:00
|
|
|
`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
|
|
|
|
|
|
|
|
setVndkMustUseVendorVariantListForTest(config, []string{"libvndk"})
|
|
|
|
|
|
|
|
ctx := testCcWithConfig(t, config)
|
2019-10-22 12:32:18 +02:00
|
|
|
|
2019-11-06 08:46:15 +01:00
|
|
|
checkVndkLibrariesOutput(t, ctx, "vndkcorevariant.libraries.txt", []string{"libc++.so", "libvndk2.so", "libvndk_sp.so"})
|
2019-10-30 10:43:49 +01:00
|
|
|
}
|
|
|
|
|
2020-06-05 23:26:16 +02:00
|
|
|
func TestDataLibs(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
cc_test_library {
|
|
|
|
name: "test_lib",
|
|
|
|
srcs: ["test_lib.cpp"],
|
|
|
|
gtest: false,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_test {
|
|
|
|
name: "main_test",
|
|
|
|
data_libs: ["test_lib"],
|
|
|
|
gtest: false,
|
|
|
|
}
|
2020-07-09 23:12:52 +02:00
|
|
|
`
|
2020-06-05 23:26:16 +02:00
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
|
|
|
|
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
module := ctx.ModuleForTests("main_test", "android_arm_armv7-a-neon").Module()
|
|
|
|
testBinary := module.(*Module).linker.(*testBinary)
|
|
|
|
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
|
|
|
|
if err != nil {
|
|
|
|
t.Errorf("Expected cc_test to produce output files, error: %s", err)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if len(outputFiles) != 1 {
|
|
|
|
t.Errorf("expected exactly one output file. output files: [%s]", outputFiles)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if len(testBinary.dataPaths()) != 1 {
|
|
|
|
t.Errorf("expected exactly one test data file. test data files: [%s]", testBinary.dataPaths())
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
outputPath := outputFiles[0].String()
|
2020-07-09 23:12:52 +02:00
|
|
|
testBinaryPath := testBinary.dataPaths()[0].SrcPath.String()
|
2020-06-05 23:26:16 +02:00
|
|
|
|
|
|
|
if !strings.HasSuffix(outputPath, "/main_test") {
|
|
|
|
t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !strings.HasSuffix(testBinaryPath, "/test_lib.so") {
|
|
|
|
t.Errorf("expected test data file to be 'test_lib.so', but was '%s'", testBinaryPath)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-09 23:12:52 +02:00
|
|
|
func TestDataLibsRelativeInstallPath(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
cc_test_library {
|
|
|
|
name: "test_lib",
|
|
|
|
srcs: ["test_lib.cpp"],
|
|
|
|
relative_install_path: "foo/bar/baz",
|
|
|
|
gtest: false,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_test {
|
|
|
|
name: "main_test",
|
|
|
|
data_libs: ["test_lib"],
|
|
|
|
gtest: false,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
|
|
|
|
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
module := ctx.ModuleForTests("main_test", "android_arm_armv7-a-neon").Module()
|
|
|
|
testBinary := module.(*Module).linker.(*testBinary)
|
|
|
|
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Expected cc_test to produce output files, error: %s", err)
|
|
|
|
}
|
|
|
|
if len(outputFiles) != 1 {
|
|
|
|
t.Errorf("expected exactly one output file. output files: [%s]", outputFiles)
|
|
|
|
}
|
|
|
|
if len(testBinary.dataPaths()) != 1 {
|
|
|
|
t.Errorf("expected exactly one test data file. test data files: [%s]", testBinary.dataPaths())
|
|
|
|
}
|
|
|
|
|
|
|
|
outputPath := outputFiles[0].String()
|
|
|
|
|
|
|
|
if !strings.HasSuffix(outputPath, "/main_test") {
|
|
|
|
t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath)
|
|
|
|
}
|
|
|
|
entries := android.AndroidMkEntriesForTest(t, config, "", module)[0]
|
|
|
|
if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:foo/bar/baz") {
|
|
|
|
t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:foo/bar/baz`,"+
|
2020-06-17 22:10:42 +02:00
|
|
|
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][0])
|
2020-07-09 23:12:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
func TestVndkWhenVndkVersionIsNotSet(t *testing.T) {
|
2019-11-06 08:46:15 +01:00
|
|
|
ctx := testCcNoVndk(t, `
|
2019-10-30 10:43:49 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-10-30 10:43:49 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2020-12-07 04:44:03 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk-private",
|
|
|
|
vendor_available: false,
|
|
|
|
product_available: false,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2019-11-06 08:46:15 +01:00
|
|
|
`)
|
2019-10-30 10:43:49 +01:00
|
|
|
|
|
|
|
checkVndkOutput(t, ctx, "vndk/vndk.libraries.txt", []string{
|
|
|
|
"LLNDK: libc.so",
|
|
|
|
"LLNDK: libdl.so",
|
|
|
|
"LLNDK: libft2.so",
|
|
|
|
"LLNDK: libm.so",
|
|
|
|
"VNDK-SP: libc++.so",
|
2020-12-07 04:44:03 +01:00
|
|
|
"VNDK-core: libvndk-private.so",
|
2019-10-30 10:43:49 +01:00
|
|
|
"VNDK-core: libvndk.so",
|
|
|
|
"VNDK-private: libft2.so",
|
2020-12-07 04:44:03 +01:00
|
|
|
"VNDK-private: libvndk-private.so",
|
|
|
|
"VNDK-product: libc++.so",
|
|
|
|
"VNDK-product: libvndk-private.so",
|
|
|
|
"VNDK-product: libvndk.so",
|
2019-10-30 10:43:49 +01: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
|
|
|
}
|
|
|
|
|
2020-10-29 08:49:43 +01:00
|
|
|
func TestVndkModuleError(t *testing.T) {
|
|
|
|
// Check the error message for vendor_available and product_available properties.
|
2020-10-29 10:24:11 +01:00
|
|
|
testCcErrorProductVndk(t, "vndk: vendor_available must be set to either true or false when `vndk: {enabled: true}`", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
testCcErrorProductVndk(t, "vndk: vendor_available must be set to either true or false when `vndk: {enabled: true}`", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
product_available: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
testCcErrorProductVndk(t, "product properties must have the same values with the vendor properties for VNDK modules", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndkprop",
|
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
cflags: ["-DTEST",],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
`)
|
2020-10-29 08:49:43 +01:00
|
|
|
}
|
|
|
|
|
2018-03-29 08:08:15 +02:00
|
|
|
func TestVndkDepError(t *testing.T) {
|
|
|
|
// Check whether an error is emitted when a VNDK lib depends on a system lib.
|
|
|
|
testCcError(t, "dependency \".*\" of \".*\" missing variant", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libfwk"], // Cause error
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libfwk",
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a VNDK lib depends on a vendor lib.
|
|
|
|
testCcError(t, "dependency \".*\" of \".*\" missing variant", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libvendor"], // Cause error
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a VNDK-SP lib depends on a system lib.
|
|
|
|
testCcError(t, "dependency \".*\" of \".*\" missing variant", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libfwk"], // Cause error
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libfwk",
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a VNDK-SP lib depends on a vendor lib.
|
|
|
|
testCcError(t, "dependency \".*\" of \".*\" missing variant", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libvendor"], // Cause error
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a VNDK-SP lib depends on a VNDK lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libvndk"], // Cause error
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
2019-01-18 07:20:43 +01:00
|
|
|
|
|
|
|
// Check whether an error is emitted when a VNDK lib depends on a non-VNDK lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libnonvndk"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnonvndk",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a VNDK-private lib depends on a non-VNDK lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndkprivate",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
},
|
|
|
|
shared_libs: ["libnonvndk"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnonvndk",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a VNDK-sp lib depends on a non-VNDK lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndksp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libnonvndk"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnonvndk",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a VNDK-sp-private lib depends on a non-VNDK lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndkspprivate",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
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
|
|
|
private: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
},
|
|
|
|
shared_libs: ["libnonvndk"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnonvndk",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestDoubleLoadbleDep(t *testing.T) {
|
|
|
|
// okay to link : LLNDK -> double_loadable VNDK
|
|
|
|
testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
shared_libs: ["libdoubleloadable"],
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libdoubleloadable",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
double_loadable: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
// okay to link : LLNDK -> VNDK-SP
|
|
|
|
testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
shared_libs: ["libvndksp"],
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndksp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
// okay to link : double_loadable -> double_loadable
|
|
|
|
testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libdoubleloadable1",
|
|
|
|
shared_libs: ["libdoubleloadable2"],
|
|
|
|
vendor_available: true,
|
|
|
|
double_loadable: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libdoubleloadable2",
|
|
|
|
vendor_available: true,
|
|
|
|
double_loadable: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
// okay to link : double_loadable VNDK -> double_loadable VNDK private
|
|
|
|
testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libdoubleloadable",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
double_loadable: true,
|
|
|
|
shared_libs: ["libnondoubleloadable"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnondoubleloadable",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
},
|
|
|
|
double_loadable: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
// okay to link : LLNDK -> core-only -> vendor_available & double_loadable
|
|
|
|
testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
shared_libs: ["libcoreonly"],
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libcoreonly",
|
|
|
|
shared_libs: ["libvendoravailable"],
|
|
|
|
}
|
|
|
|
|
|
|
|
// indirect dependency of LLNDK
|
|
|
|
cc_library {
|
|
|
|
name: "libvendoravailable",
|
|
|
|
vendor_available: true,
|
|
|
|
double_loadable: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
2020-09-07 12:53:31 +02:00
|
|
|
func TestVendorSnapshotCapture(t *testing.T) {
|
2019-11-15 01:59:12 +01:00
|
|
|
bp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-11-15 01:59:12 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor_available",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_headers {
|
|
|
|
name: "libvendor_headers",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_binary {
|
|
|
|
name: "vendor_bin",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_binary {
|
|
|
|
name: "vendor_available_bin",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2020-06-01 14:53:49 +02:00
|
|
|
|
|
|
|
toolchain_library {
|
|
|
|
name: "libb",
|
|
|
|
vendor_available: true,
|
|
|
|
src: "libb.a",
|
|
|
|
}
|
2020-06-01 16:23:05 +02:00
|
|
|
|
|
|
|
cc_object {
|
|
|
|
name: "obj",
|
|
|
|
vendor_available: true,
|
|
|
|
}
|
2020-12-17 01:46:01 +01:00
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
llndk_stubs: "libllndk.llndk",
|
|
|
|
}
|
|
|
|
|
|
|
|
llndk_library {
|
|
|
|
name: "libllndk.llndk",
|
|
|
|
symbol_file: "",
|
|
|
|
}
|
2019-11-15 01:59:12 +01:00
|
|
|
`
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
|
|
|
|
// Check Vendor snapshot output.
|
|
|
|
|
|
|
|
snapshotDir := "vendor-snapshot"
|
|
|
|
snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64")
|
2020-06-01 14:53:49 +02:00
|
|
|
snapshotSingleton := ctx.SingletonForTests("vendor-snapshot")
|
|
|
|
|
|
|
|
var jsonFiles []string
|
2019-11-15 01:59:12 +01:00
|
|
|
|
|
|
|
for _, arch := range [][]string{
|
|
|
|
[]string{"arm64", "armv8-a"},
|
|
|
|
[]string{"arm", "armv7-a-neon"},
|
|
|
|
} {
|
|
|
|
archType := arch[0]
|
|
|
|
archVariant := arch[1]
|
|
|
|
archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant)
|
|
|
|
|
|
|
|
// For shared libraries, only non-VNDK vendor_available modules are captured
|
|
|
|
sharedVariant := fmt.Sprintf("android_vendor.VER_%s_%s_shared", archType, archVariant)
|
|
|
|
sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared")
|
2020-06-01 14:53:49 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvendor", "libvendor.so", sharedDir, sharedVariant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.so", sharedDir, sharedVariant)
|
|
|
|
jsonFiles = append(jsonFiles,
|
|
|
|
filepath.Join(sharedDir, "libvendor.so.json"),
|
|
|
|
filepath.Join(sharedDir, "libvendor_available.so.json"))
|
2019-11-15 01:59:12 +01:00
|
|
|
|
2020-12-17 01:46:01 +01:00
|
|
|
// LLNDK modules are not captured
|
|
|
|
checkSnapshotExclude(t, ctx, snapshotSingleton, "libllndk", "libllndk.so", sharedDir, sharedVariant)
|
|
|
|
|
2019-11-15 01:59:12 +01:00
|
|
|
// For static libraries, all vendor:true and vendor_available modules (including VNDK) are captured.
|
Add cfi static libraries to vendor snapshot
CFI modules can't link against non-CFI static libraries, and vice versa.
So without capturing both CFI and non-CFI static libraries, vendor
modules won't be able to use CFI, which will be a critical security
hole.
This captures both CFI and non-CFI variants of all static libraries for
vendor snapshot, except for those whose cfi are explicitly disabled.
For example, suppose that "libfoo" is defined as follows.
cc_library_static {
name: "libfoo",
vendor_available: true,
}
As it doesn't have cfi disabled, two libraries "libfoo.a" and
"libfoo.cfi.a" will be captured. When installed, vendor snapshot module
for "libfoo" will look like:
vendor_snapshot_static {
name: "libfoo",
src: "libfoo.a",
cfi: {
src: "libfoo.cfi.a",
},
}
The build system will recognize the "cfi" property, and will create both
CFI and non-CFI variant, allowing any modules to link against "libfoo"
safely, no matter whether CFI is enabled or not.
Two clarification:
1) The reason why we don't create separate modules is that DepsMutator
runs before sanitize mutators. CFI and non-CFI variant of a library
should exist in a single module.
2) We can't capture CFI variant if the source module explicitly disables
cfi variant by specifying the following.
sanitize: {
cfi: false,
}
In this case, only non-CFI variant will be created for the vendor
snapshot module.
Bug: 65377115
Test: m dist vendor-snapshot && install && build against snapshot
Change-Id: Idbf3e3205d581800d6093c8d6cf6152374129ba4
2020-07-29 13:32:10 +02:00
|
|
|
// Also cfi variants are captured, except for prebuilts like toolchain_library
|
2019-11-15 01:59:12 +01:00
|
|
|
staticVariant := fmt.Sprintf("android_vendor.VER_%s_%s_static", archType, archVariant)
|
Add cfi static libraries to vendor snapshot
CFI modules can't link against non-CFI static libraries, and vice versa.
So without capturing both CFI and non-CFI static libraries, vendor
modules won't be able to use CFI, which will be a critical security
hole.
This captures both CFI and non-CFI variants of all static libraries for
vendor snapshot, except for those whose cfi are explicitly disabled.
For example, suppose that "libfoo" is defined as follows.
cc_library_static {
name: "libfoo",
vendor_available: true,
}
As it doesn't have cfi disabled, two libraries "libfoo.a" and
"libfoo.cfi.a" will be captured. When installed, vendor snapshot module
for "libfoo" will look like:
vendor_snapshot_static {
name: "libfoo",
src: "libfoo.a",
cfi: {
src: "libfoo.cfi.a",
},
}
The build system will recognize the "cfi" property, and will create both
CFI and non-CFI variant, allowing any modules to link against "libfoo"
safely, no matter whether CFI is enabled or not.
Two clarification:
1) The reason why we don't create separate modules is that DepsMutator
runs before sanitize mutators. CFI and non-CFI variant of a library
should exist in a single module.
2) We can't capture CFI variant if the source module explicitly disables
cfi variant by specifying the following.
sanitize: {
cfi: false,
}
In this case, only non-CFI variant will be created for the vendor
snapshot module.
Bug: 65377115
Test: m dist vendor-snapshot && install && build against snapshot
Change-Id: Idbf3e3205d581800d6093c8d6cf6152374129ba4
2020-07-29 13:32:10 +02:00
|
|
|
staticCfiVariant := fmt.Sprintf("android_vendor.VER_%s_%s_static_cfi", archType, archVariant)
|
2019-11-15 01:59:12 +01:00
|
|
|
staticDir := filepath.Join(snapshotVariantPath, archDir, "static")
|
2020-06-01 14:53:49 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libb", "libb.a", staticDir, staticVariant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.a", staticDir, staticVariant)
|
Add cfi static libraries to vendor snapshot
CFI modules can't link against non-CFI static libraries, and vice versa.
So without capturing both CFI and non-CFI static libraries, vendor
modules won't be able to use CFI, which will be a critical security
hole.
This captures both CFI and non-CFI variants of all static libraries for
vendor snapshot, except for those whose cfi are explicitly disabled.
For example, suppose that "libfoo" is defined as follows.
cc_library_static {
name: "libfoo",
vendor_available: true,
}
As it doesn't have cfi disabled, two libraries "libfoo.a" and
"libfoo.cfi.a" will be captured. When installed, vendor snapshot module
for "libfoo" will look like:
vendor_snapshot_static {
name: "libfoo",
src: "libfoo.a",
cfi: {
src: "libfoo.cfi.a",
},
}
The build system will recognize the "cfi" property, and will create both
CFI and non-CFI variant, allowing any modules to link against "libfoo"
safely, no matter whether CFI is enabled or not.
Two clarification:
1) The reason why we don't create separate modules is that DepsMutator
runs before sanitize mutators. CFI and non-CFI variant of a library
should exist in a single module.
2) We can't capture CFI variant if the source module explicitly disables
cfi variant by specifying the following.
sanitize: {
cfi: false,
}
In this case, only non-CFI variant will be created for the vendor
snapshot module.
Bug: 65377115
Test: m dist vendor-snapshot && install && build against snapshot
Change-Id: Idbf3e3205d581800d6093c8d6cf6152374129ba4
2020-07-29 13:32:10 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.cfi.a", staticDir, staticCfiVariant)
|
2020-06-01 14:53:49 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvendor", "libvendor.a", staticDir, staticVariant)
|
Add cfi static libraries to vendor snapshot
CFI modules can't link against non-CFI static libraries, and vice versa.
So without capturing both CFI and non-CFI static libraries, vendor
modules won't be able to use CFI, which will be a critical security
hole.
This captures both CFI and non-CFI variants of all static libraries for
vendor snapshot, except for those whose cfi are explicitly disabled.
For example, suppose that "libfoo" is defined as follows.
cc_library_static {
name: "libfoo",
vendor_available: true,
}
As it doesn't have cfi disabled, two libraries "libfoo.a" and
"libfoo.cfi.a" will be captured. When installed, vendor snapshot module
for "libfoo" will look like:
vendor_snapshot_static {
name: "libfoo",
src: "libfoo.a",
cfi: {
src: "libfoo.cfi.a",
},
}
The build system will recognize the "cfi" property, and will create both
CFI and non-CFI variant, allowing any modules to link against "libfoo"
safely, no matter whether CFI is enabled or not.
Two clarification:
1) The reason why we don't create separate modules is that DepsMutator
runs before sanitize mutators. CFI and non-CFI variant of a library
should exist in a single module.
2) We can't capture CFI variant if the source module explicitly disables
cfi variant by specifying the following.
sanitize: {
cfi: false,
}
In this case, only non-CFI variant will be created for the vendor
snapshot module.
Bug: 65377115
Test: m dist vendor-snapshot && install && build against snapshot
Change-Id: Idbf3e3205d581800d6093c8d6cf6152374129ba4
2020-07-29 13:32:10 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvendor", "libvendor.cfi.a", staticDir, staticCfiVariant)
|
2020-06-01 14:53:49 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.a", staticDir, staticVariant)
|
Add cfi static libraries to vendor snapshot
CFI modules can't link against non-CFI static libraries, and vice versa.
So without capturing both CFI and non-CFI static libraries, vendor
modules won't be able to use CFI, which will be a critical security
hole.
This captures both CFI and non-CFI variants of all static libraries for
vendor snapshot, except for those whose cfi are explicitly disabled.
For example, suppose that "libfoo" is defined as follows.
cc_library_static {
name: "libfoo",
vendor_available: true,
}
As it doesn't have cfi disabled, two libraries "libfoo.a" and
"libfoo.cfi.a" will be captured. When installed, vendor snapshot module
for "libfoo" will look like:
vendor_snapshot_static {
name: "libfoo",
src: "libfoo.a",
cfi: {
src: "libfoo.cfi.a",
},
}
The build system will recognize the "cfi" property, and will create both
CFI and non-CFI variant, allowing any modules to link against "libfoo"
safely, no matter whether CFI is enabled or not.
Two clarification:
1) The reason why we don't create separate modules is that DepsMutator
runs before sanitize mutators. CFI and non-CFI variant of a library
should exist in a single module.
2) We can't capture CFI variant if the source module explicitly disables
cfi variant by specifying the following.
sanitize: {
cfi: false,
}
In this case, only non-CFI variant will be created for the vendor
snapshot module.
Bug: 65377115
Test: m dist vendor-snapshot && install && build against snapshot
Change-Id: Idbf3e3205d581800d6093c8d6cf6152374129ba4
2020-07-29 13:32:10 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.cfi.a", staticDir, staticCfiVariant)
|
2020-06-01 14:53:49 +02:00
|
|
|
jsonFiles = append(jsonFiles,
|
|
|
|
filepath.Join(staticDir, "libb.a.json"),
|
|
|
|
filepath.Join(staticDir, "libvndk.a.json"),
|
Add cfi static libraries to vendor snapshot
CFI modules can't link against non-CFI static libraries, and vice versa.
So without capturing both CFI and non-CFI static libraries, vendor
modules won't be able to use CFI, which will be a critical security
hole.
This captures both CFI and non-CFI variants of all static libraries for
vendor snapshot, except for those whose cfi are explicitly disabled.
For example, suppose that "libfoo" is defined as follows.
cc_library_static {
name: "libfoo",
vendor_available: true,
}
As it doesn't have cfi disabled, two libraries "libfoo.a" and
"libfoo.cfi.a" will be captured. When installed, vendor snapshot module
for "libfoo" will look like:
vendor_snapshot_static {
name: "libfoo",
src: "libfoo.a",
cfi: {
src: "libfoo.cfi.a",
},
}
The build system will recognize the "cfi" property, and will create both
CFI and non-CFI variant, allowing any modules to link against "libfoo"
safely, no matter whether CFI is enabled or not.
Two clarification:
1) The reason why we don't create separate modules is that DepsMutator
runs before sanitize mutators. CFI and non-CFI variant of a library
should exist in a single module.
2) We can't capture CFI variant if the source module explicitly disables
cfi variant by specifying the following.
sanitize: {
cfi: false,
}
In this case, only non-CFI variant will be created for the vendor
snapshot module.
Bug: 65377115
Test: m dist vendor-snapshot && install && build against snapshot
Change-Id: Idbf3e3205d581800d6093c8d6cf6152374129ba4
2020-07-29 13:32:10 +02:00
|
|
|
filepath.Join(staticDir, "libvndk.cfi.a.json"),
|
2020-06-01 14:53:49 +02:00
|
|
|
filepath.Join(staticDir, "libvendor.a.json"),
|
Add cfi static libraries to vendor snapshot
CFI modules can't link against non-CFI static libraries, and vice versa.
So without capturing both CFI and non-CFI static libraries, vendor
modules won't be able to use CFI, which will be a critical security
hole.
This captures both CFI and non-CFI variants of all static libraries for
vendor snapshot, except for those whose cfi are explicitly disabled.
For example, suppose that "libfoo" is defined as follows.
cc_library_static {
name: "libfoo",
vendor_available: true,
}
As it doesn't have cfi disabled, two libraries "libfoo.a" and
"libfoo.cfi.a" will be captured. When installed, vendor snapshot module
for "libfoo" will look like:
vendor_snapshot_static {
name: "libfoo",
src: "libfoo.a",
cfi: {
src: "libfoo.cfi.a",
},
}
The build system will recognize the "cfi" property, and will create both
CFI and non-CFI variant, allowing any modules to link against "libfoo"
safely, no matter whether CFI is enabled or not.
Two clarification:
1) The reason why we don't create separate modules is that DepsMutator
runs before sanitize mutators. CFI and non-CFI variant of a library
should exist in a single module.
2) We can't capture CFI variant if the source module explicitly disables
cfi variant by specifying the following.
sanitize: {
cfi: false,
}
In this case, only non-CFI variant will be created for the vendor
snapshot module.
Bug: 65377115
Test: m dist vendor-snapshot && install && build against snapshot
Change-Id: Idbf3e3205d581800d6093c8d6cf6152374129ba4
2020-07-29 13:32:10 +02:00
|
|
|
filepath.Join(staticDir, "libvendor.cfi.a.json"),
|
|
|
|
filepath.Join(staticDir, "libvendor_available.a.json"),
|
|
|
|
filepath.Join(staticDir, "libvendor_available.cfi.a.json"))
|
2020-06-01 14:53:49 +02:00
|
|
|
|
|
|
|
// For binary executables, all vendor:true and vendor_available modules are captured.
|
2019-11-15 01:59:12 +01:00
|
|
|
if archType == "arm64" {
|
|
|
|
binaryVariant := fmt.Sprintf("android_vendor.VER_%s_%s", archType, archVariant)
|
|
|
|
binaryDir := filepath.Join(snapshotVariantPath, archDir, "binary")
|
2020-06-01 14:53:49 +02:00
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "vendor_bin", "vendor_bin", binaryDir, binaryVariant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "vendor_available_bin", "vendor_available_bin", binaryDir, binaryVariant)
|
|
|
|
jsonFiles = append(jsonFiles,
|
|
|
|
filepath.Join(binaryDir, "vendor_bin.json"),
|
|
|
|
filepath.Join(binaryDir, "vendor_available_bin.json"))
|
|
|
|
}
|
|
|
|
|
|
|
|
// For header libraries, all vendor:true and vendor_available modules are captured.
|
|
|
|
headerDir := filepath.Join(snapshotVariantPath, archDir, "header")
|
|
|
|
jsonFiles = append(jsonFiles, filepath.Join(headerDir, "libvendor_headers.json"))
|
2020-06-01 16:23:05 +02:00
|
|
|
|
|
|
|
// For object modules, all vendor:true and vendor_available modules are captured.
|
|
|
|
objectVariant := fmt.Sprintf("android_vendor.VER_%s_%s", archType, archVariant)
|
|
|
|
objectDir := filepath.Join(snapshotVariantPath, archDir, "object")
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "obj", "obj.o", objectDir, objectVariant)
|
|
|
|
jsonFiles = append(jsonFiles, filepath.Join(objectDir, "obj.o.json"))
|
2020-06-01 14:53:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for _, jsonFile := range jsonFiles {
|
|
|
|
// verify all json files exist
|
|
|
|
if snapshotSingleton.MaybeOutput(jsonFile).Rule == nil {
|
|
|
|
t.Errorf("%q expected but not found", jsonFile)
|
2019-11-15 01:59:12 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-07 12:53:31 +02:00
|
|
|
func TestVendorSnapshotUse(t *testing.T) {
|
|
|
|
frameworkBp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-09-07 12:53:31 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
compile_multilib: "64",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
no_libcrt: true,
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
compile_multilib: "64",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_binary {
|
|
|
|
name: "bin",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
no_libcrt: true,
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
compile_multilib: "64",
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
vndkBp := `
|
|
|
|
vndk_prebuilt_shared {
|
|
|
|
name: "libvndk",
|
|
|
|
version: "BOARD",
|
|
|
|
target_arch: "arm64",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-09-07 12:53:31 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
arch: {
|
|
|
|
arm64: {
|
|
|
|
srcs: ["libvndk.so"],
|
2020-10-19 03:15:28 +02:00
|
|
|
export_include_dirs: ["include/libvndk"],
|
2020-09-07 12:53:31 +02:00
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
vendorProprietaryBp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor_without_snapshot",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
no_libcrt: true,
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
compile_multilib: "64",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libclient",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
no_libcrt: true,
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
shared_libs: ["libvndk"],
|
|
|
|
static_libs: ["libvendor", "libvendor_without_snapshot"],
|
|
|
|
compile_multilib: "64",
|
2020-10-19 03:15:28 +02:00
|
|
|
srcs: ["client.cpp"],
|
2020-09-07 12:53:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
cc_binary {
|
|
|
|
name: "bin_without_snapshot",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
no_libcrt: true,
|
|
|
|
stl: "none",
|
|
|
|
system_shared_libs: [],
|
|
|
|
static_libs: ["libvndk"],
|
|
|
|
compile_multilib: "64",
|
2020-10-19 03:15:28 +02:00
|
|
|
srcs: ["bin.cpp"],
|
2020-09-07 12:53:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
vendor_snapshot_static {
|
|
|
|
name: "libvndk",
|
|
|
|
version: "BOARD",
|
|
|
|
target_arch: "arm64",
|
|
|
|
vendor: true,
|
|
|
|
arch: {
|
|
|
|
arm64: {
|
|
|
|
src: "libvndk.a",
|
2020-10-19 03:15:28 +02:00
|
|
|
export_include_dirs: ["include/libvndk"],
|
2020-09-07 12:53:31 +02:00
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
vendor_snapshot_shared {
|
|
|
|
name: "libvendor",
|
|
|
|
version: "BOARD",
|
|
|
|
target_arch: "arm64",
|
|
|
|
vendor: true,
|
|
|
|
arch: {
|
|
|
|
arm64: {
|
|
|
|
src: "libvendor.so",
|
2020-10-19 03:15:28 +02:00
|
|
|
export_include_dirs: ["include/libvendor"],
|
2020-09-07 12:53:31 +02:00
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
vendor_snapshot_static {
|
|
|
|
name: "libvendor",
|
|
|
|
version: "BOARD",
|
|
|
|
target_arch: "arm64",
|
|
|
|
vendor: true,
|
|
|
|
arch: {
|
|
|
|
arm64: {
|
|
|
|
src: "libvendor.a",
|
2020-10-19 03:15:28 +02:00
|
|
|
export_include_dirs: ["include/libvendor"],
|
2020-09-07 12:53:31 +02:00
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
vendor_snapshot_binary {
|
|
|
|
name: "bin",
|
|
|
|
version: "BOARD",
|
|
|
|
target_arch: "arm64",
|
|
|
|
vendor: true,
|
|
|
|
arch: {
|
|
|
|
arm64: {
|
|
|
|
src: "bin",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
`
|
|
|
|
depsBp := GatherRequiredDepsForTest(android.Android)
|
|
|
|
|
|
|
|
mockFS := map[string][]byte{
|
2020-10-19 03:15:28 +02:00
|
|
|
"deps/Android.bp": []byte(depsBp),
|
|
|
|
"framework/Android.bp": []byte(frameworkBp),
|
|
|
|
"vendor/Android.bp": []byte(vendorProprietaryBp),
|
|
|
|
"vendor/bin": nil,
|
|
|
|
"vendor/bin.cpp": nil,
|
|
|
|
"vendor/client.cpp": nil,
|
|
|
|
"vendor/include/libvndk/a.h": nil,
|
|
|
|
"vendor/include/libvendor/b.h": nil,
|
|
|
|
"vendor/libvndk.a": nil,
|
|
|
|
"vendor/libvendor.a": nil,
|
|
|
|
"vendor/libvendor.so": nil,
|
|
|
|
"vndk/Android.bp": []byte(vndkBp),
|
|
|
|
"vndk/include/libvndk/a.h": nil,
|
|
|
|
"vndk/libvndk.so": nil,
|
2020-09-07 12:53:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, "", mockFS)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("BOARD")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx := CreateTestContext(config)
|
|
|
|
ctx.Register()
|
2020-09-07 12:53:31 +02:00
|
|
|
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"deps/Android.bp", "framework/Android.bp", "vendor/Android.bp", "vndk/Android.bp"})
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
|
|
|
|
sharedVariant := "android_vendor.BOARD_arm64_armv8-a_shared"
|
|
|
|
staticVariant := "android_vendor.BOARD_arm64_armv8-a_static"
|
|
|
|
binaryVariant := "android_vendor.BOARD_arm64_armv8-a"
|
|
|
|
|
|
|
|
// libclient uses libvndk.vndk.BOARD.arm64, libvendor.vendor_static.BOARD.arm64, libvendor_without_snapshot
|
2020-10-19 03:15:28 +02:00
|
|
|
libclientCcFlags := ctx.ModuleForTests("libclient", sharedVariant).Rule("cc").Args["cFlags"]
|
|
|
|
for _, includeFlags := range []string{
|
|
|
|
"-Ivndk/include/libvndk", // libvndk
|
|
|
|
"-Ivendor/include/libvendor", // libvendor
|
|
|
|
} {
|
|
|
|
if !strings.Contains(libclientCcFlags, includeFlags) {
|
|
|
|
t.Errorf("flags for libclient must contain %#v, but was %#v.",
|
|
|
|
includeFlags, libclientCcFlags)
|
|
|
|
}
|
|
|
|
}
|
2020-09-07 12:53:31 +02:00
|
|
|
|
2020-10-19 03:15:28 +02:00
|
|
|
libclientLdFlags := ctx.ModuleForTests("libclient", sharedVariant).Rule("ld").Args["libFlags"]
|
2020-09-07 12:53:31 +02:00
|
|
|
for _, input := range [][]string{
|
|
|
|
[]string{sharedVariant, "libvndk.vndk.BOARD.arm64"},
|
|
|
|
[]string{staticVariant, "libvendor.vendor_static.BOARD.arm64"},
|
|
|
|
[]string{staticVariant, "libvendor_without_snapshot"},
|
|
|
|
} {
|
|
|
|
outputPaths := getOutputPaths(ctx, input[0] /* variant */, []string{input[1]} /* module name */)
|
2020-10-19 03:15:28 +02:00
|
|
|
if !strings.Contains(libclientLdFlags, outputPaths[0].String()) {
|
|
|
|
t.Errorf("libflags for libclient must contain %#v, but was %#v", outputPaths[0], libclientLdFlags)
|
2020-09-07 12:53:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// bin_without_snapshot uses libvndk.vendor_static.BOARD.arm64
|
2020-10-19 03:15:28 +02:00
|
|
|
binWithoutSnapshotCcFlags := ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Rule("cc").Args["cFlags"]
|
|
|
|
if !strings.Contains(binWithoutSnapshotCcFlags, "-Ivendor/include/libvndk") {
|
|
|
|
t.Errorf("flags for bin_without_snapshot must contain %#v, but was %#v.",
|
|
|
|
"-Ivendor/include/libvndk", binWithoutSnapshotCcFlags)
|
|
|
|
}
|
|
|
|
|
|
|
|
binWithoutSnapshotLdFlags := ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Rule("ld").Args["libFlags"]
|
2020-09-07 12:53:31 +02:00
|
|
|
libVndkStaticOutputPaths := getOutputPaths(ctx, staticVariant, []string{"libvndk.vendor_static.BOARD.arm64"})
|
2020-10-19 03:15:28 +02:00
|
|
|
if !strings.Contains(binWithoutSnapshotLdFlags, libVndkStaticOutputPaths[0].String()) {
|
2020-09-07 12:53:31 +02:00
|
|
|
t.Errorf("libflags for bin_without_snapshot must contain %#v, but was %#v",
|
2020-10-19 03:15:28 +02:00
|
|
|
libVndkStaticOutputPaths[0], binWithoutSnapshotLdFlags)
|
2020-09-07 12:53:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// libvendor.so is installed by libvendor.vendor_shared.BOARD.arm64
|
|
|
|
ctx.ModuleForTests("libvendor.vendor_shared.BOARD.arm64", sharedVariant).Output("libvendor.so")
|
|
|
|
|
|
|
|
// libvendor_without_snapshot.so is installed by libvendor_without_snapshot
|
|
|
|
ctx.ModuleForTests("libvendor_without_snapshot", sharedVariant).Output("libvendor_without_snapshot.so")
|
|
|
|
|
|
|
|
// bin is installed by bin.vendor_binary.BOARD.arm64
|
|
|
|
ctx.ModuleForTests("bin.vendor_binary.BOARD.arm64", binaryVariant).Output("bin")
|
|
|
|
|
|
|
|
// bin_without_snapshot is installed by bin_without_snapshot
|
|
|
|
ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Output("bin_without_snapshot")
|
|
|
|
|
|
|
|
// libvendor and bin don't have vendor.BOARD variant
|
|
|
|
libvendorVariants := ctx.ModuleVariantsForTests("libvendor")
|
|
|
|
if inList(sharedVariant, libvendorVariants) {
|
|
|
|
t.Errorf("libvendor must not have variant %#v, but it does", sharedVariant)
|
|
|
|
}
|
|
|
|
|
|
|
|
binVariants := ctx.ModuleVariantsForTests("bin")
|
|
|
|
if inList(binaryVariant, binVariants) {
|
|
|
|
t.Errorf("bin must not have variant %#v, but it does", sharedVariant)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add cfi static libraries to vendor snapshot
CFI modules can't link against non-CFI static libraries, and vice versa.
So without capturing both CFI and non-CFI static libraries, vendor
modules won't be able to use CFI, which will be a critical security
hole.
This captures both CFI and non-CFI variants of all static libraries for
vendor snapshot, except for those whose cfi are explicitly disabled.
For example, suppose that "libfoo" is defined as follows.
cc_library_static {
name: "libfoo",
vendor_available: true,
}
As it doesn't have cfi disabled, two libraries "libfoo.a" and
"libfoo.cfi.a" will be captured. When installed, vendor snapshot module
for "libfoo" will look like:
vendor_snapshot_static {
name: "libfoo",
src: "libfoo.a",
cfi: {
src: "libfoo.cfi.a",
},
}
The build system will recognize the "cfi" property, and will create both
CFI and non-CFI variant, allowing any modules to link against "libfoo"
safely, no matter whether CFI is enabled or not.
Two clarification:
1) The reason why we don't create separate modules is that DepsMutator
runs before sanitize mutators. CFI and non-CFI variant of a library
should exist in a single module.
2) We can't capture CFI variant if the source module explicitly disables
cfi variant by specifying the following.
sanitize: {
cfi: false,
}
In this case, only non-CFI variant will be created for the vendor
snapshot module.
Bug: 65377115
Test: m dist vendor-snapshot && install && build against snapshot
Change-Id: Idbf3e3205d581800d6093c8d6cf6152374129ba4
2020-07-29 13:32:10 +02:00
|
|
|
func TestVendorSnapshotSanitizer(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
vendor_snapshot_static {
|
|
|
|
name: "libsnapshot",
|
|
|
|
vendor: true,
|
|
|
|
target_arch: "arm64",
|
|
|
|
version: "BOARD",
|
|
|
|
arch: {
|
|
|
|
arm64: {
|
|
|
|
src: "libsnapshot.a",
|
|
|
|
cfi: {
|
|
|
|
src: "libsnapshot.cfi.a",
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
`
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("BOARD")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
|
|
|
|
// Check non-cfi and cfi variant.
|
|
|
|
staticVariant := "android_vendor.BOARD_arm64_armv8-a_static"
|
|
|
|
staticCfiVariant := "android_vendor.BOARD_arm64_armv8-a_static_cfi"
|
|
|
|
|
|
|
|
staticModule := ctx.ModuleForTests("libsnapshot.vendor_static.BOARD.arm64", staticVariant).Module().(*Module)
|
|
|
|
assertString(t, staticModule.outputFile.Path().Base(), "libsnapshot.a")
|
|
|
|
|
|
|
|
staticCfiModule := ctx.ModuleForTests("libsnapshot.vendor_static.BOARD.arm64", staticCfiVariant).Module().(*Module)
|
|
|
|
assertString(t, staticCfiModule.outputFile.Path().Base(), "libsnapshot.cfi.a")
|
|
|
|
}
|
|
|
|
|
2020-09-01 01:07:58 +02:00
|
|
|
func assertExcludeFromVendorSnapshotIs(t *testing.T, c *Module, expected bool) {
|
|
|
|
t.Helper()
|
|
|
|
if c.ExcludeFromVendorSnapshot() != expected {
|
|
|
|
t.Errorf("expected %q ExcludeFromVendorSnapshot to be %t", c.String(), expected)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-11 22:36:29 +01:00
|
|
|
func assertExcludeFromRecoverySnapshotIs(t *testing.T, c *Module, expected bool) {
|
|
|
|
t.Helper()
|
|
|
|
if c.ExcludeFromRecoverySnapshot() != expected {
|
|
|
|
t.Errorf("expected %q ExcludeFromRecoverySnapshot to be %t", c.String(), expected)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-01 01:07:58 +02:00
|
|
|
func TestVendorSnapshotExclude(t *testing.T) {
|
|
|
|
|
|
|
|
// This test verifies that the exclude_from_vendor_snapshot property
|
|
|
|
// makes its way from the Android.bp source file into the module data
|
|
|
|
// structure. It also verifies that modules are correctly included or
|
|
|
|
// excluded in the vendor snapshot based on their path (framework or
|
|
|
|
// vendor) and the exclude_from_vendor_snapshot property.
|
|
|
|
|
|
|
|
frameworkBp := `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libinclude",
|
|
|
|
srcs: ["src/include.cpp"],
|
|
|
|
vendor_available: true,
|
|
|
|
}
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libexclude",
|
|
|
|
srcs: ["src/exclude.cpp"],
|
|
|
|
vendor: true,
|
|
|
|
exclude_from_vendor_snapshot: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
vendorProprietaryBp := `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libvendor",
|
|
|
|
srcs: ["vendor.cpp"],
|
|
|
|
vendor: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
depsBp := GatherRequiredDepsForTest(android.Android)
|
|
|
|
|
|
|
|
mockFS := map[string][]byte{
|
|
|
|
"deps/Android.bp": []byte(depsBp),
|
|
|
|
"framework/Android.bp": []byte(frameworkBp),
|
|
|
|
"framework/include.cpp": nil,
|
|
|
|
"framework/exclude.cpp": nil,
|
|
|
|
"device/Android.bp": []byte(vendorProprietaryBp),
|
|
|
|
"device/vendor.cpp": nil,
|
|
|
|
}
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, "", mockFS)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx := CreateTestContext(config)
|
|
|
|
ctx.Register()
|
2020-09-01 01:07:58 +02:00
|
|
|
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"deps/Android.bp", "framework/Android.bp", "device/Android.bp"})
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
|
|
|
|
// Test an include and exclude framework module.
|
|
|
|
assertExcludeFromVendorSnapshotIs(t, ctx.ModuleForTests("libinclude", coreVariant).Module().(*Module), false)
|
|
|
|
assertExcludeFromVendorSnapshotIs(t, ctx.ModuleForTests("libinclude", vendorVariant).Module().(*Module), false)
|
|
|
|
assertExcludeFromVendorSnapshotIs(t, ctx.ModuleForTests("libexclude", vendorVariant).Module().(*Module), true)
|
|
|
|
|
|
|
|
// A vendor module is excluded, but by its path, not the
|
|
|
|
// exclude_from_vendor_snapshot property.
|
|
|
|
assertExcludeFromVendorSnapshotIs(t, ctx.ModuleForTests("libvendor", vendorVariant).Module().(*Module), false)
|
|
|
|
|
|
|
|
// Verify the content of the vendor snapshot.
|
|
|
|
|
|
|
|
snapshotDir := "vendor-snapshot"
|
|
|
|
snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64")
|
|
|
|
snapshotSingleton := ctx.SingletonForTests("vendor-snapshot")
|
|
|
|
|
|
|
|
var includeJsonFiles []string
|
|
|
|
var excludeJsonFiles []string
|
|
|
|
|
|
|
|
for _, arch := range [][]string{
|
|
|
|
[]string{"arm64", "armv8-a"},
|
|
|
|
[]string{"arm", "armv7-a-neon"},
|
|
|
|
} {
|
|
|
|
archType := arch[0]
|
|
|
|
archVariant := arch[1]
|
|
|
|
archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant)
|
|
|
|
|
|
|
|
sharedVariant := fmt.Sprintf("android_vendor.VER_%s_%s_shared", archType, archVariant)
|
|
|
|
sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared")
|
|
|
|
|
|
|
|
// Included modules
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libinclude", "libinclude.so", sharedDir, sharedVariant)
|
|
|
|
includeJsonFiles = append(includeJsonFiles, filepath.Join(sharedDir, "libinclude.so.json"))
|
|
|
|
|
|
|
|
// Excluded modules
|
|
|
|
checkSnapshotExclude(t, ctx, snapshotSingleton, "libexclude", "libexclude.so", sharedDir, sharedVariant)
|
|
|
|
excludeJsonFiles = append(excludeJsonFiles, filepath.Join(sharedDir, "libexclude.so.json"))
|
|
|
|
checkSnapshotExclude(t, ctx, snapshotSingleton, "libvendor", "libvendor.so", sharedDir, sharedVariant)
|
|
|
|
excludeJsonFiles = append(excludeJsonFiles, filepath.Join(sharedDir, "libvendor.so.json"))
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify that each json file for an included module has a rule.
|
|
|
|
for _, jsonFile := range includeJsonFiles {
|
|
|
|
if snapshotSingleton.MaybeOutput(jsonFile).Rule == nil {
|
|
|
|
t.Errorf("include json file %q not found", jsonFile)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify that each json file for an excluded module has no rule.
|
|
|
|
for _, jsonFile := range excludeJsonFiles {
|
|
|
|
if snapshotSingleton.MaybeOutput(jsonFile).Rule != nil {
|
|
|
|
t.Errorf("exclude json file %q found", jsonFile)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestVendorSnapshotExcludeInVendorProprietaryPathErrors(t *testing.T) {
|
|
|
|
|
|
|
|
// This test verifies that using the exclude_from_vendor_snapshot
|
|
|
|
// property on a module in a vendor proprietary path generates an
|
|
|
|
// error. These modules are already excluded, so we prohibit using the
|
|
|
|
// property in this way, which could add to confusion.
|
|
|
|
|
|
|
|
vendorProprietaryBp := `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libvendor",
|
|
|
|
srcs: ["vendor.cpp"],
|
|
|
|
vendor: true,
|
|
|
|
exclude_from_vendor_snapshot: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
depsBp := GatherRequiredDepsForTest(android.Android)
|
|
|
|
|
|
|
|
mockFS := map[string][]byte{
|
|
|
|
"deps/Android.bp": []byte(depsBp),
|
|
|
|
"device/Android.bp": []byte(vendorProprietaryBp),
|
|
|
|
"device/vendor.cpp": nil,
|
|
|
|
}
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, "", mockFS)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx := CreateTestContext(config)
|
|
|
|
ctx.Register()
|
2020-09-01 01:07:58 +02:00
|
|
|
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"deps/Android.bp", "device/Android.bp"})
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
android.CheckErrorsAgainstExpectations(t, errs, []string{
|
|
|
|
`module "libvendor\{.+,image:vendor.+,arch:arm64_.+\}" in vendor proprietary path "device" may not use "exclude_from_vendor_snapshot: true"`,
|
|
|
|
`module "libvendor\{.+,image:vendor.+,arch:arm_.+\}" in vendor proprietary path "device" may not use "exclude_from_vendor_snapshot: true"`,
|
2020-11-13 21:07:36 +01:00
|
|
|
`module "libvendor\{.+,image:vendor.+,arch:arm64_.+\}" in vendor proprietary path "device" may not use "exclude_from_vendor_snapshot: true"`,
|
|
|
|
`module "libvendor\{.+,image:vendor.+,arch:arm_.+\}" in vendor proprietary path "device" may not use "exclude_from_vendor_snapshot: true"`,
|
2020-09-01 01:07:58 +02:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestVendorSnapshotExcludeWithVendorAvailable(t *testing.T) {
|
|
|
|
|
|
|
|
// This test verifies that using the exclude_from_vendor_snapshot
|
|
|
|
// property on a module that is vendor available generates an error. A
|
|
|
|
// vendor available module must be captured in the vendor snapshot and
|
|
|
|
// must not built from source when building the vendor image against
|
|
|
|
// the vendor snapshot.
|
|
|
|
|
|
|
|
frameworkBp := `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libinclude",
|
|
|
|
srcs: ["src/include.cpp"],
|
|
|
|
vendor_available: true,
|
|
|
|
exclude_from_vendor_snapshot: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
depsBp := GatherRequiredDepsForTest(android.Android)
|
|
|
|
|
|
|
|
mockFS := map[string][]byte{
|
|
|
|
"deps/Android.bp": []byte(depsBp),
|
|
|
|
"framework/Android.bp": []byte(frameworkBp),
|
|
|
|
"framework/include.cpp": nil,
|
|
|
|
}
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, "", mockFS)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx := CreateTestContext(config)
|
|
|
|
ctx.Register()
|
2020-09-01 01:07:58 +02:00
|
|
|
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"deps/Android.bp", "framework/Android.bp"})
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
android.CheckErrorsAgainstExpectations(t, errs, []string{
|
|
|
|
`module "libinclude\{.+,image:,arch:arm64_.+\}" may not use both "vendor_available: true" and "exclude_from_vendor_snapshot: true"`,
|
|
|
|
`module "libinclude\{.+,image:,arch:arm_.+\}" may not use both "vendor_available: true" and "exclude_from_vendor_snapshot: true"`,
|
|
|
|
`module "libinclude\{.+,image:vendor.+,arch:arm64_.+\}" may not use both "vendor_available: true" and "exclude_from_vendor_snapshot: true"`,
|
|
|
|
`module "libinclude\{.+,image:vendor.+,arch:arm_.+\}" may not use both "vendor_available: true" and "exclude_from_vendor_snapshot: true"`,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2020-11-13 21:07:36 +01:00
|
|
|
func TestRecoverySnapshotCapture(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
|
|
|
recovery_available: true,
|
|
|
|
product_available: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "librecovery",
|
|
|
|
recovery: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "librecovery_available",
|
|
|
|
recovery_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_headers {
|
|
|
|
name: "librecovery_headers",
|
|
|
|
recovery_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_binary {
|
|
|
|
name: "recovery_bin",
|
|
|
|
recovery: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_binary {
|
|
|
|
name: "recovery_available_bin",
|
|
|
|
recovery_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
toolchain_library {
|
|
|
|
name: "libb",
|
|
|
|
recovery_available: true,
|
|
|
|
src: "libb.a",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_object {
|
|
|
|
name: "obj",
|
|
|
|
recovery_available: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
2020-12-11 22:36:29 +01:00
|
|
|
config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current")
|
2020-11-13 21:07:36 +01:00
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
|
|
|
|
// Check Recovery snapshot output.
|
|
|
|
|
|
|
|
snapshotDir := "recovery-snapshot"
|
|
|
|
snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64")
|
|
|
|
snapshotSingleton := ctx.SingletonForTests("recovery-snapshot")
|
|
|
|
|
|
|
|
var jsonFiles []string
|
|
|
|
|
|
|
|
for _, arch := range [][]string{
|
|
|
|
[]string{"arm64", "armv8-a"},
|
|
|
|
} {
|
|
|
|
archType := arch[0]
|
|
|
|
archVariant := arch[1]
|
|
|
|
archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant)
|
|
|
|
|
|
|
|
// For shared libraries, only recovery_available modules are captured.
|
|
|
|
sharedVariant := fmt.Sprintf("android_recovery_%s_%s_shared", archType, archVariant)
|
|
|
|
sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared")
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.so", sharedDir, sharedVariant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "librecovery", "librecovery.so", sharedDir, sharedVariant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "librecovery_available", "librecovery_available.so", sharedDir, sharedVariant)
|
|
|
|
jsonFiles = append(jsonFiles,
|
|
|
|
filepath.Join(sharedDir, "libvndk.so.json"),
|
|
|
|
filepath.Join(sharedDir, "librecovery.so.json"),
|
|
|
|
filepath.Join(sharedDir, "librecovery_available.so.json"))
|
|
|
|
|
|
|
|
// For static libraries, all recovery:true and recovery_available modules are captured.
|
|
|
|
staticVariant := fmt.Sprintf("android_recovery_%s_%s_static", archType, archVariant)
|
|
|
|
staticDir := filepath.Join(snapshotVariantPath, archDir, "static")
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libb", "libb.a", staticDir, staticVariant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "librecovery", "librecovery.a", staticDir, staticVariant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "librecovery_available", "librecovery_available.a", staticDir, staticVariant)
|
|
|
|
jsonFiles = append(jsonFiles,
|
|
|
|
filepath.Join(staticDir, "libb.a.json"),
|
|
|
|
filepath.Join(staticDir, "librecovery.a.json"),
|
|
|
|
filepath.Join(staticDir, "librecovery_available.a.json"))
|
|
|
|
|
|
|
|
// For binary executables, all recovery:true and recovery_available modules are captured.
|
|
|
|
if archType == "arm64" {
|
|
|
|
binaryVariant := fmt.Sprintf("android_recovery_%s_%s", archType, archVariant)
|
|
|
|
binaryDir := filepath.Join(snapshotVariantPath, archDir, "binary")
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "recovery_bin", "recovery_bin", binaryDir, binaryVariant)
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "recovery_available_bin", "recovery_available_bin", binaryDir, binaryVariant)
|
|
|
|
jsonFiles = append(jsonFiles,
|
|
|
|
filepath.Join(binaryDir, "recovery_bin.json"),
|
|
|
|
filepath.Join(binaryDir, "recovery_available_bin.json"))
|
|
|
|
}
|
|
|
|
|
|
|
|
// For header libraries, all vendor:true and vendor_available modules are captured.
|
|
|
|
headerDir := filepath.Join(snapshotVariantPath, archDir, "header")
|
|
|
|
jsonFiles = append(jsonFiles, filepath.Join(headerDir, "librecovery_headers.json"))
|
|
|
|
|
|
|
|
// For object modules, all vendor:true and vendor_available modules are captured.
|
|
|
|
objectVariant := fmt.Sprintf("android_recovery_%s_%s", archType, archVariant)
|
|
|
|
objectDir := filepath.Join(snapshotVariantPath, archDir, "object")
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "obj", "obj.o", objectDir, objectVariant)
|
|
|
|
jsonFiles = append(jsonFiles, filepath.Join(objectDir, "obj.o.json"))
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, jsonFile := range jsonFiles {
|
|
|
|
// verify all json files exist
|
|
|
|
if snapshotSingleton.MaybeOutput(jsonFile).Rule == nil {
|
|
|
|
t.Errorf("%q expected but not found", jsonFile)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-11 22:36:29 +01:00
|
|
|
func TestRecoverySnapshotExclude(t *testing.T) {
|
|
|
|
// This test verifies that the exclude_from_recovery_snapshot property
|
|
|
|
// makes its way from the Android.bp source file into the module data
|
|
|
|
// structure. It also verifies that modules are correctly included or
|
|
|
|
// excluded in the recovery snapshot based on their path (framework or
|
|
|
|
// vendor) and the exclude_from_recovery_snapshot property.
|
|
|
|
|
|
|
|
frameworkBp := `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libinclude",
|
|
|
|
srcs: ["src/include.cpp"],
|
|
|
|
recovery_available: true,
|
|
|
|
}
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libexclude",
|
|
|
|
srcs: ["src/exclude.cpp"],
|
|
|
|
recovery: true,
|
|
|
|
exclude_from_recovery_snapshot: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
vendorProprietaryBp := `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libvendor",
|
|
|
|
srcs: ["vendor.cpp"],
|
|
|
|
recovery: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
depsBp := GatherRequiredDepsForTest(android.Android)
|
|
|
|
|
|
|
|
mockFS := map[string][]byte{
|
|
|
|
"deps/Android.bp": []byte(depsBp),
|
|
|
|
"framework/Android.bp": []byte(frameworkBp),
|
|
|
|
"framework/include.cpp": nil,
|
|
|
|
"framework/exclude.cpp": nil,
|
|
|
|
"device/Android.bp": []byte(vendorProprietaryBp),
|
|
|
|
"device/vendor.cpp": nil,
|
|
|
|
}
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, "", mockFS)
|
|
|
|
config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
ctx := CreateTestContext(config)
|
|
|
|
ctx.Register()
|
|
|
|
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"deps/Android.bp", "framework/Android.bp", "device/Android.bp"})
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
|
|
|
|
// Test an include and exclude framework module.
|
|
|
|
assertExcludeFromRecoverySnapshotIs(t, ctx.ModuleForTests("libinclude", coreVariant).Module().(*Module), false)
|
|
|
|
assertExcludeFromRecoverySnapshotIs(t, ctx.ModuleForTests("libinclude", recoveryVariant).Module().(*Module), false)
|
|
|
|
assertExcludeFromRecoverySnapshotIs(t, ctx.ModuleForTests("libexclude", recoveryVariant).Module().(*Module), true)
|
|
|
|
|
|
|
|
// A vendor module is excluded, but by its path, not the
|
|
|
|
// exclude_from_recovery_snapshot property.
|
|
|
|
assertExcludeFromRecoverySnapshotIs(t, ctx.ModuleForTests("libvendor", recoveryVariant).Module().(*Module), false)
|
|
|
|
|
|
|
|
// Verify the content of the recovery snapshot.
|
|
|
|
|
|
|
|
snapshotDir := "recovery-snapshot"
|
|
|
|
snapshotVariantPath := filepath.Join(buildDir, snapshotDir, "arm64")
|
|
|
|
snapshotSingleton := ctx.SingletonForTests("recovery-snapshot")
|
|
|
|
|
|
|
|
var includeJsonFiles []string
|
|
|
|
var excludeJsonFiles []string
|
|
|
|
|
|
|
|
for _, arch := range [][]string{
|
|
|
|
[]string{"arm64", "armv8-a"},
|
|
|
|
} {
|
|
|
|
archType := arch[0]
|
|
|
|
archVariant := arch[1]
|
|
|
|
archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant)
|
|
|
|
|
|
|
|
sharedVariant := fmt.Sprintf("android_recovery_%s_%s_shared", archType, archVariant)
|
|
|
|
sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared")
|
|
|
|
|
|
|
|
// Included modules
|
|
|
|
checkSnapshot(t, ctx, snapshotSingleton, "libinclude", "libinclude.so", sharedDir, sharedVariant)
|
|
|
|
includeJsonFiles = append(includeJsonFiles, filepath.Join(sharedDir, "libinclude.so.json"))
|
|
|
|
|
|
|
|
// Excluded modules
|
|
|
|
checkSnapshotExclude(t, ctx, snapshotSingleton, "libexclude", "libexclude.so", sharedDir, sharedVariant)
|
|
|
|
excludeJsonFiles = append(excludeJsonFiles, filepath.Join(sharedDir, "libexclude.so.json"))
|
|
|
|
checkSnapshotExclude(t, ctx, snapshotSingleton, "libvendor", "libvendor.so", sharedDir, sharedVariant)
|
|
|
|
excludeJsonFiles = append(excludeJsonFiles, filepath.Join(sharedDir, "libvendor.so.json"))
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify that each json file for an included module has a rule.
|
|
|
|
for _, jsonFile := range includeJsonFiles {
|
|
|
|
if snapshotSingleton.MaybeOutput(jsonFile).Rule == nil {
|
|
|
|
t.Errorf("include json file %q not found", jsonFile)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify that each json file for an excluded module has no rule.
|
|
|
|
for _, jsonFile := range excludeJsonFiles {
|
|
|
|
if snapshotSingleton.MaybeOutput(jsonFile).Rule != nil {
|
|
|
|
t.Errorf("exclude json file %q found", jsonFile)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-18 07:20:43 +01:00
|
|
|
func TestDoubleLoadableDepError(t *testing.T) {
|
|
|
|
// Check whether an error is emitted when a LLNDK depends on a non-double_loadable VNDK lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": link.* \".*\" which is not LL-NDK, VNDK-SP, .*double_loadable", `
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
shared_libs: ["libnondoubleloadable"],
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnondoubleloadable",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a LLNDK depends on a non-double_loadable vendor_available lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": link.* \".*\" which is not LL-NDK, VNDK-SP, .*double_loadable", `
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
shared_libs: ["libnondoubleloadable"],
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnondoubleloadable",
|
|
|
|
vendor_available: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a double_loadable lib depends on a non-double_loadable vendor_available lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": link.* \".*\" which is not LL-NDK, VNDK-SP, .*double_loadable", `
|
|
|
|
cc_library {
|
|
|
|
name: "libdoubleloadable",
|
|
|
|
vendor_available: true,
|
|
|
|
double_loadable: true,
|
|
|
|
shared_libs: ["libnondoubleloadable"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnondoubleloadable",
|
|
|
|
vendor_available: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a double_loadable lib depends on a non-double_loadable VNDK lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": link.* \".*\" which is not LL-NDK, VNDK-SP, .*double_loadable", `
|
|
|
|
cc_library {
|
|
|
|
name: "libdoubleloadable",
|
|
|
|
vendor_available: true,
|
|
|
|
double_loadable: true,
|
|
|
|
shared_libs: ["libnondoubleloadable"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnondoubleloadable",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a double_loadable VNDK depends on a non-double_loadable VNDK private lib.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": link.* \".*\" which is not LL-NDK, VNDK-SP, .*double_loadable", `
|
|
|
|
cc_library {
|
|
|
|
name: "libdoubleloadable",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
double_loadable: true,
|
|
|
|
shared_libs: ["libnondoubleloadable"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libnondoubleloadable",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
2019-01-18 07:20:43 +01:00
|
|
|
},
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Check whether an error is emitted when a LLNDK depends on a non-double_loadable indirectly.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": link.* \".*\" which is not LL-NDK, VNDK-SP, .*double_loadable", `
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
shared_libs: ["libcoreonly"],
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2019-01-18 07:20:43 +01:00
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libcoreonly",
|
|
|
|
shared_libs: ["libvendoravailable"],
|
|
|
|
}
|
|
|
|
|
|
|
|
// indirect dependency of LLNDK
|
|
|
|
cc_library {
|
|
|
|
name: "libvendoravailable",
|
|
|
|
vendor_available: true,
|
|
|
|
}
|
|
|
|
`)
|
2018-03-29 08:08:15 +02:00
|
|
|
}
|
|
|
|
|
2020-10-19 11:51:07 +02:00
|
|
|
func TestCheckVndkMembershipBeforeDoubleLoadable(t *testing.T) {
|
|
|
|
testCcError(t, "module \"libvndksp\" variant .*: .*: VNDK-SP must only depend on VNDK-SP", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndksp",
|
|
|
|
shared_libs: ["libanothervndksp"],
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-10-19 11:51:07 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
shared_libs: ["libanothervndksp"],
|
|
|
|
}
|
|
|
|
|
|
|
|
llndk_library {
|
|
|
|
name: "libllndk",
|
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libanothervndksp",
|
|
|
|
vendor_available: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
func TestVndkExt(t *testing.T) {
|
|
|
|
// This test checks the VNDK-Ext properties.
|
2020-02-28 07:07:59 +01:00
|
|
|
bp := `
|
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
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2019-10-22 12:53:47 +02:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk2",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-10-22 12:53:47 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
suffix: "-suffix",
|
|
|
|
},
|
2020-10-29 08:49:43 +01:00
|
|
|
product: {
|
|
|
|
suffix: "-suffix",
|
|
|
|
},
|
2019-10-22 12:53:47 +02:00
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2019-10-22 12:53:47 +02:00
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk2_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk2",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
|
2020-02-28 07:07:59 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext_product",
|
|
|
|
product_specific: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2019-10-22 12:53:47 +02:00
|
|
|
|
2020-02-28 07:07:59 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk2_ext_product",
|
|
|
|
product_specific: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk2",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.ProductVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
|
|
|
|
checkVndkModule(t, ctx, "libvndk_ext", "vndk", false, "libvndk", vendorVariant)
|
|
|
|
checkVndkModule(t, ctx, "libvndk_ext_product", "vndk", false, "libvndk", productVariant)
|
|
|
|
|
|
|
|
mod_vendor := ctx.ModuleForTests("libvndk2_ext", vendorVariant).Module().(*Module)
|
|
|
|
assertString(t, mod_vendor.outputFile.Path().Base(), "libvndk2-suffix.so")
|
|
|
|
|
|
|
|
mod_product := ctx.ModuleForTests("libvndk2_ext_product", productVariant).Module().(*Module)
|
|
|
|
assertString(t, mod_product.outputFile.Path().Base(), "libvndk2-suffix.so")
|
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
|
|
|
func TestVndkExtWithoutBoardVndkVersion(t *testing.T) {
|
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
|
|
|
// This test checks the VNDK-Ext properties when BOARD_VNDK_VERSION is not set.
|
|
|
|
ctx := testCcNoVndk(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Ensures that the core variant of "libvndk_ext" can be found.
|
|
|
|
mod := ctx.ModuleForTests("libvndk_ext", coreVariant).Module().(*Module)
|
|
|
|
if extends := mod.getVndkExtendsModuleName(); extends != "libvndk" {
|
|
|
|
t.Errorf("\"libvndk_ext\" must extend from \"libvndk\" but get %q", extends)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-28 07:07:59 +01:00
|
|
|
func TestVndkExtWithoutProductVndkVersion(t *testing.T) {
|
|
|
|
// This test checks the VNDK-Ext properties when PRODUCT_PRODUCT_VNDK_VERSION is not set.
|
2020-12-07 04:44:03 +01:00
|
|
|
ctx := testCcNoProductVndk(t, `
|
2020-02-28 07:07:59 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-02-28 07:07:59 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext_product",
|
|
|
|
product_specific: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// Ensures that the core variant of "libvndk_ext_product" can be found.
|
|
|
|
mod := ctx.ModuleForTests("libvndk_ext_product", coreVariant).Module().(*Module)
|
|
|
|
if extends := mod.getVndkExtendsModuleName(); extends != "libvndk" {
|
|
|
|
t.Errorf("\"libvndk_ext_product\" must extend from \"libvndk\" but get %q", extends)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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 TestVndkExtError(t *testing.T) {
|
|
|
|
// This test ensures an error is emitted in ill-formed vndk-ext definition.
|
2020-02-28 07:07:59 +01:00
|
|
|
testCcError(t, "must set `vendor: true` or `product_specific: true` to set `extends: \".*\"`", `
|
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
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
testCcError(t, "must set `extends: \"\\.\\.\\.\"` to vndk extension", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
2020-02-28 07:07:59 +01:00
|
|
|
|
|
|
|
testCcErrorProductVndk(t, "must set `extends: \"\\.\\.\\.\"` to vndk extension", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-02-28 07:07:59 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext_product",
|
|
|
|
product_specific: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
testCcErrorProductVndk(t, "must not set at the same time as `vndk: {extends: \"\\.\\.\\.\"}`", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-02-28 07:07:59 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext_product",
|
|
|
|
product_specific: true,
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-02-28 07:07:59 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestVndkExtInconsistentSupportSystemProcessError(t *testing.T) {
|
|
|
|
// This test ensures an error is emitted for inconsistent support_system_process.
|
|
|
|
testCcError(t, "module \".*\" with mismatched support_system_process", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
testCcError(t, "module \".*\" with mismatched support_system_process", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk_sp",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestVndkExtVendorAvailableFalseError(t *testing.T) {
|
2018-03-29 08:08:15 +02:00
|
|
|
// This test ensures an error is emitted when a VNDK-Ext library extends a VNDK library
|
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
|
|
|
// with `private: true`.
|
|
|
|
testCcError(t, "`extends` refers module \".*\" which has `private: true`", `
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
2020-02-28 07:07:59 +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
|
|
|
testCcErrorProductVndk(t, "`extends` refers module \".*\" which has `private: true`", `
|
2020-02-28 07:07:59 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
2020-02-28 07:07:59 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
2020-02-28 07:07:59 +01:00
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext_product",
|
|
|
|
product_specific: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
}
|
|
|
|
|
2018-03-29 08:08:15 +02:00
|
|
|
func TestVendorModuleUseVndkExt(t *testing.T) {
|
|
|
|
// This test ensures a vendor module can depend on a VNDK-Ext library.
|
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
|
|
|
testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk_sp",
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
shared_libs: ["libvndk_ext", "libvndk_sp_ext"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
2018-03-29 08:08:15 +02:00
|
|
|
func TestVndkExtUseVendorLib(t *testing.T) {
|
|
|
|
// This test ensures a VNDK-Ext library can depend on a vendor library.
|
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
|
|
|
testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
shared_libs: ["libvendor"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
2018-03-29 08:08:15 +02:00
|
|
|
|
|
|
|
// This test ensures a VNDK-SP-Ext library can depend on a vendor library.
|
|
|
|
testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk_sp",
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libvendor"], // Cause an error
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
}
|
|
|
|
|
2020-02-28 07:07:59 +01:00
|
|
|
func TestProductVndkExtDependency(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-02-28 07:07:59 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext_product",
|
|
|
|
product_specific: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
shared_libs: ["libproduct_for_vndklibs"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2020-02-28 07:07:59 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_ext_product",
|
|
|
|
product_specific: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk_sp",
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libproduct_for_vndklibs"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libproduct",
|
|
|
|
product_specific: true,
|
|
|
|
shared_libs: ["libvndk_ext_product", "libvndk_sp_ext_product"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libproduct_for_vndklibs",
|
|
|
|
product_specific: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.ProductVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
|
|
|
|
testCcWithConfig(t, config)
|
|
|
|
}
|
|
|
|
|
2018-03-29 08:08:15 +02:00
|
|
|
func TestVndkSpExtUseVndkError(t *testing.T) {
|
|
|
|
// This test ensures an error is emitted if a VNDK-SP-Ext library depends on a VNDK
|
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
|
|
|
// library.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
2018-03-29 08:08:15 +02:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk_sp",
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
2018-03-29 08:08:15 +02:00
|
|
|
shared_libs: ["libvndk"], // Cause an error
|
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
|
|
|
nocrt: true,
|
|
|
|
}
|
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-03-29 08:08:15 +02:00
|
|
|
// This test ensures an error is emitted if a VNDK-SP-Ext library depends on a VNDK-Ext
|
|
|
|
// library.
|
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
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
|
|
|
cc_library {
|
2018-03-29 08:08:15 +02:00
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_ext",
|
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
|
|
|
vendor: true,
|
2018-03-29 08:08:15 +02:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk_sp",
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libvndk_ext"], // Cause an error
|
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
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
2018-03-29 08:08:15 +02:00
|
|
|
func TestVndkUseVndkExtError(t *testing.T) {
|
|
|
|
// This test ensures an error is emitted if a VNDK/VNDK-SP library depends on a
|
|
|
|
// VNDK-Ext/VNDK-SP-Ext library.
|
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
|
|
|
testCcError(t, "dependency \".*\" of \".*\" missing variant", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk2",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libvndk_ext"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
2018-11-06 17:12:13 +01:00
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
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
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk2",
|
|
|
|
vendor_available: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
shared_libs: ["libvndk_ext"],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
testCcError(t, "dependency \".*\" of \".*\" missing variant", `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk_sp",
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_2",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
shared_libs: ["libvndk_sp_ext"],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
2018-11-06 17:12:13 +01:00
|
|
|
testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
|
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
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp_ext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk_sp",
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp2",
|
|
|
|
vendor_available: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
shared_libs: ["libvndk_sp_ext"],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
2019-11-18 11:52:14 +01:00
|
|
|
func TestEnforceProductVndkVersion(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2019-11-18 11:52:14 +01:00
|
|
|
}
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2019-11-18 11:52:14 +01:00
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-11-18 11:52:14 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_sp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-11-18 11:52:14 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libva",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2020-10-29 08:49:43 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libpa",
|
|
|
|
product_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
2020-10-29 10:24:11 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libboth_available",
|
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
target: {
|
|
|
|
vendor: {
|
|
|
|
suffix: "-vendor",
|
|
|
|
},
|
|
|
|
product: {
|
|
|
|
suffix: "-product",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
2019-11-18 11:52:14 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libproduct_va",
|
|
|
|
product_specific: true,
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libprod",
|
|
|
|
product_specific: true,
|
|
|
|
shared_libs: [
|
|
|
|
"libllndk",
|
|
|
|
"libvndk",
|
|
|
|
"libvndk_sp",
|
2020-10-29 08:49:43 +01:00
|
|
|
"libpa",
|
2020-10-29 10:24:11 +01:00
|
|
|
"libboth_available",
|
2019-11-18 11:52:14 +01:00
|
|
|
"libproduct_va",
|
|
|
|
],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
shared_libs: [
|
|
|
|
"libllndk",
|
|
|
|
"libvndk",
|
|
|
|
"libvndk_sp",
|
|
|
|
"libva",
|
2020-10-29 10:24:11 +01:00
|
|
|
"libboth_available",
|
2019-11-18 11:52:14 +01:00
|
|
|
"libproduct_va",
|
|
|
|
],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.ProductVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
|
2020-10-20 11:54:21 +02:00
|
|
|
checkVndkModule(t, ctx, "libvndk", "", false, "", productVariant)
|
|
|
|
checkVndkModule(t, ctx, "libvndk_sp", "", true, "", productVariant)
|
2020-10-29 10:24:11 +01:00
|
|
|
|
|
|
|
mod_vendor := ctx.ModuleForTests("libboth_available", vendorVariant).Module().(*Module)
|
|
|
|
assertString(t, mod_vendor.outputFile.Path().Base(), "libboth_available-vendor.so")
|
|
|
|
|
|
|
|
mod_product := ctx.ModuleForTests("libboth_available", productVariant).Module().(*Module)
|
|
|
|
assertString(t, mod_product.outputFile.Path().Base(), "libboth_available-product.so")
|
2019-11-18 11:52:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestEnforceProductVndkVersionErrors(t *testing.T) {
|
|
|
|
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", `
|
|
|
|
cc_library {
|
|
|
|
name: "libprod",
|
|
|
|
product_specific: true,
|
|
|
|
shared_libs: [
|
|
|
|
"libvendor",
|
|
|
|
],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", `
|
|
|
|
cc_library {
|
|
|
|
name: "libprod",
|
|
|
|
product_specific: true,
|
|
|
|
shared_libs: [
|
|
|
|
"libsystem",
|
|
|
|
],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libsystem",
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
2020-10-29 10:24:11 +01:00
|
|
|
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", `
|
|
|
|
cc_library {
|
|
|
|
name: "libprod",
|
|
|
|
product_specific: true,
|
|
|
|
shared_libs: [
|
|
|
|
"libva",
|
|
|
|
],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libva",
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
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
|
|
|
testCcErrorProductVndk(t, "non-VNDK module should not link to \".*\" which has `private: true`", `
|
2019-11-18 11:52:14 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libprod",
|
|
|
|
product_specific: true,
|
|
|
|
shared_libs: [
|
|
|
|
"libvndk_private",
|
|
|
|
],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk_private",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
2019-11-18 11:52:14 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
2019-11-18 11:52:14 +01:00
|
|
|
},
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", `
|
|
|
|
cc_library {
|
|
|
|
name: "libprod",
|
|
|
|
product_specific: true,
|
|
|
|
shared_libs: [
|
|
|
|
"libsystem_ext",
|
|
|
|
],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libsystem_ext",
|
|
|
|
system_ext_specific: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:", `
|
|
|
|
cc_library {
|
|
|
|
name: "libsystem",
|
|
|
|
shared_libs: [
|
|
|
|
"libproduct_va",
|
|
|
|
],
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libproduct_va",
|
|
|
|
product_specific: true,
|
|
|
|
vendor_available: true,
|
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
2019-05-15 21:01:54 +02:00
|
|
|
func TestMakeLinkType(t *testing.T) {
|
2019-12-14 05:41:13 +01:00
|
|
|
bp := `
|
|
|
|
cc_library {
|
|
|
|
name: "libvndk",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-12-14 05:41:13 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvndksp",
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-12-14 05:41:13 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
support_system_process: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvndkprivate",
|
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
|
|
|
vendor_available: true,
|
|
|
|
product_available: true,
|
2019-12-14 05:41:13 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
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
|
|
|
private: true,
|
2019-12-14 05:41:13 +01:00
|
|
|
},
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
vendor: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvndkext",
|
|
|
|
vendor: true,
|
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
extends: "libvndk",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
vndk_prebuilt_shared {
|
|
|
|
name: "prevndk",
|
|
|
|
version: "27",
|
|
|
|
target_arch: "arm",
|
|
|
|
binder32bit: true,
|
|
|
|
vendor_available: true,
|
2020-10-29 08:49:43 +01:00
|
|
|
product_available: true,
|
2019-12-14 05:41:13 +01:00
|
|
|
vndk: {
|
|
|
|
enabled: true,
|
|
|
|
},
|
|
|
|
arch: {
|
|
|
|
arm: {
|
|
|
|
srcs: ["liba.so"],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2019-12-14 05:41:13 +01:00
|
|
|
}
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2019-12-14 05:41:13 +01:00
|
|
|
symbol_file: "",
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libllndkprivate",
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndkprivate.llndk",
|
2019-12-14 05:41:13 +01:00
|
|
|
}
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndkprivate.llndk",
|
2019-12-14 05:41:13 +01:00
|
|
|
vendor_available: false,
|
|
|
|
symbol_file: "",
|
|
|
|
}`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
2019-05-15 21:01:54 +02:00
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
// native:vndk
|
2019-12-14 05:41:13 +01:00
|
|
|
ctx := testCcWithConfig(t, config)
|
2019-05-15 21:01:54 +02:00
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
assertMapKeys(t, vndkCoreLibraries(config),
|
2019-05-15 21:01:54 +02:00
|
|
|
[]string{"libvndk", "libvndkprivate"})
|
2019-10-30 10:43:49 +01:00
|
|
|
assertMapKeys(t, vndkSpLibraries(config),
|
2019-05-15 21:01:54 +02:00
|
|
|
[]string{"libc++", "libvndksp"})
|
2019-10-30 10:43:49 +01:00
|
|
|
assertMapKeys(t, llndkLibraries(config),
|
2019-10-22 12:32:18 +02:00
|
|
|
[]string{"libc", "libdl", "libft2", "libllndk", "libllndkprivate", "libm"})
|
2019-10-30 10:43:49 +01:00
|
|
|
assertMapKeys(t, vndkPrivateLibraries(config),
|
2019-10-22 12:32:18 +02:00
|
|
|
[]string{"libft2", "libllndkprivate", "libvndkprivate"})
|
2019-05-15 21:01:54 +02:00
|
|
|
|
2019-11-21 02:12:35 +01:00
|
|
|
vendorVariant27 := "android_vendor.27_arm64_armv8-a_shared"
|
2019-08-26 09:52:35 +02:00
|
|
|
|
2019-05-15 21:01:54 +02:00
|
|
|
tests := []struct {
|
|
|
|
variant string
|
|
|
|
name string
|
|
|
|
expected string
|
|
|
|
}{
|
|
|
|
{vendorVariant, "libvndk", "native:vndk"},
|
|
|
|
{vendorVariant, "libvndksp", "native:vndk"},
|
|
|
|
{vendorVariant, "libvndkprivate", "native:vndk_private"},
|
|
|
|
{vendorVariant, "libvendor", "native:vendor"},
|
|
|
|
{vendorVariant, "libvndkext", "native:vendor"},
|
2020-12-17 01:46:01 +01:00
|
|
|
{vendorVariant, "libllndk", "native:vndk"},
|
2019-08-26 09:52:35 +02:00
|
|
|
{vendorVariant27, "prevndk.vndk.27.arm.binder32", "native:vndk"},
|
2019-05-15 21:01:54 +02:00
|
|
|
{coreVariant, "libvndk", "native:platform"},
|
|
|
|
{coreVariant, "libvndkprivate", "native:platform"},
|
|
|
|
{coreVariant, "libllndk", "native:platform"},
|
|
|
|
}
|
|
|
|
for _, test := range tests {
|
|
|
|
t.Run(test.name, func(t *testing.T) {
|
|
|
|
module := ctx.ModuleForTests(test.name, test.variant).Module().(*Module)
|
|
|
|
assertString(t, module.makeLinkType, test.expected)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-28 02:05:30 +02:00
|
|
|
var staticLinkDepOrderTestCases = []struct {
|
|
|
|
// This is a string representation of a map[moduleName][]moduleDependency .
|
|
|
|
// It models the dependencies declared in an Android.bp file.
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic string
|
|
|
|
|
|
|
|
// This is a string representation of a map[moduleName][]moduleDependency .
|
|
|
|
// It models the dependencies declared in an Android.bp file.
|
|
|
|
inShared string
|
2017-09-28 02:05:30 +02:00
|
|
|
|
|
|
|
// allOrdered is a string representation of a map[moduleName][]moduleDependency .
|
|
|
|
// The keys of allOrdered specify which modules we would like to check.
|
|
|
|
// The values of allOrdered specify the expected result (of the transitive closure of all
|
|
|
|
// dependencies) for each module to test
|
|
|
|
allOrdered string
|
|
|
|
|
|
|
|
// outOrdered is a string representation of a map[moduleName][]moduleDependency .
|
|
|
|
// The keys of outOrdered specify which modules we would like to check.
|
|
|
|
// The values of outOrdered specify the expected result (of the ordered linker command line)
|
|
|
|
// for each module to test.
|
|
|
|
outOrdered string
|
|
|
|
}{
|
|
|
|
// Simple tests
|
|
|
|
{
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "",
|
|
|
|
},
|
|
|
|
{
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a:",
|
|
|
|
},
|
|
|
|
{
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:b; b:",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a:b; b:",
|
|
|
|
},
|
|
|
|
// Tests of reordering
|
|
|
|
{
|
|
|
|
// diamond example
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:d,b,c; b:d; c:d; d:",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a:b,c,d; b:d; c:d; d:",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
// somewhat real example
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "bsdiff_unittest:b,c,d,e,f,g,h,i; e:b",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "bsdiff_unittest:c,d,e,b,f,g,h,i; e:b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
// multiple reorderings
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:b,c,d,e; d:b; e:c",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a:d,b,e,c; d:b; e:c",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
// should reorder without adding new transitive dependencies
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "bin:lib2,lib1; lib1:lib2,liboptional",
|
2017-09-28 02:05:30 +02:00
|
|
|
allOrdered: "bin:lib1,lib2,liboptional; lib1:lib2,liboptional",
|
|
|
|
outOrdered: "bin:lib1,lib2; lib1:lib2,liboptional",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
// multiple levels of dependencies
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:b,c,d,e,f,g,h; f:b,c,d; b:c,d; c:d",
|
2017-09-28 02:05:30 +02:00
|
|
|
allOrdered: "a:e,f,b,c,d,g,h; f:b,c,d; b:c,d; c:d",
|
|
|
|
outOrdered: "a:e,f,b,c,d,g,h; f:b,c,d; b:c,d; c:d",
|
|
|
|
},
|
2017-11-28 00:48:57 +01:00
|
|
|
// shared dependencies
|
|
|
|
{
|
|
|
|
// Note that this test doesn't recurse, to minimize the amount of logic it tests.
|
|
|
|
// So, we don't actually have to check that a shared dependency of c will change the order
|
|
|
|
// of a library that depends statically on b and on c. We only need to check that if c has
|
|
|
|
// a shared dependency on b, that that shows up in allOrdered.
|
|
|
|
inShared: "c:b",
|
|
|
|
allOrdered: "c:b",
|
|
|
|
outOrdered: "c:",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
// This test doesn't actually include any shared dependencies but it's a reminder of what
|
|
|
|
// the second phase of the above test would look like
|
|
|
|
inStatic: "a:b,c; c:b",
|
|
|
|
allOrdered: "a:c,b; c:b",
|
|
|
|
outOrdered: "a:c,b; c:b",
|
|
|
|
},
|
2017-09-28 02:05:30 +02:00
|
|
|
// tiebreakers for when two modules specifying different orderings and there is no dependency
|
|
|
|
// to dictate an order
|
|
|
|
{
|
|
|
|
// if the tie is between two modules at the end of a's deps, then a's order wins
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a1:b,c,d,e; a2:b,c,e,d; b:d,e; c:e,d",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a1:b,c,d,e; a2:b,c,e,d; b:d,e; c:e,d",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
// if the tie is between two modules at the start of a's deps, then c's order is used
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a1:d,e,b1,c1; b1:d,e; c1:e,d; a2:d,e,b2,c2; b2:d,e; c2:d,e",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a1:b1,c1,e,d; b1:d,e; c1:e,d; a2:b2,c2,d,e; b2:d,e; c2:d,e",
|
|
|
|
},
|
|
|
|
// Tests involving duplicate dependencies
|
|
|
|
{
|
|
|
|
// simple duplicate
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:b,c,c,b",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a:c,b",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
// duplicates with reordering
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:b,c,d,c; c:b",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a:d,c,b",
|
|
|
|
},
|
|
|
|
// Tests to confirm the nonexistence of infinite loops.
|
|
|
|
// These cases should never happen, so as long as the test terminates and the
|
|
|
|
// result is deterministic then that should be fine.
|
|
|
|
{
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:a",
|
2017-09-28 02:05:30 +02:00
|
|
|
outOrdered: "a:a",
|
|
|
|
},
|
|
|
|
{
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:b; b:c; c:a",
|
2017-09-28 02:05:30 +02:00
|
|
|
allOrdered: "a:b,c; b:c,a; c:a,b",
|
|
|
|
outOrdered: "a:b; b:c; c:a",
|
|
|
|
},
|
|
|
|
{
|
2017-11-28 00:48:57 +01:00
|
|
|
inStatic: "a:b,c; b:c,a; c:a,b",
|
2017-09-28 02:05:30 +02:00
|
|
|
allOrdered: "a:c,a,b; b:a,b,c; c:b,c,a",
|
|
|
|
outOrdered: "a:c,b; b:a,c; c:b,a",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// converts from a string like "a:b,c; d:e" to (["a","b"], {"a":["b","c"], "d":["e"]}, [{"a", "a.o"}, {"b", "b.o"}])
|
|
|
|
func parseModuleDeps(text string) (modulesInOrder []android.Path, allDeps map[android.Path][]android.Path) {
|
|
|
|
// convert from "a:b,c; d:e" to "a:b,c;d:e"
|
|
|
|
strippedText := strings.Replace(text, " ", "", -1)
|
|
|
|
if len(strippedText) < 1 {
|
|
|
|
return []android.Path{}, make(map[android.Path][]android.Path, 0)
|
|
|
|
}
|
|
|
|
allDeps = make(map[android.Path][]android.Path, 0)
|
|
|
|
|
|
|
|
// convert from "a:b,c;d:e" to ["a:b,c", "d:e"]
|
|
|
|
moduleTexts := strings.Split(strippedText, ";")
|
|
|
|
|
|
|
|
outputForModuleName := func(moduleName string) android.Path {
|
|
|
|
return android.PathForTesting(moduleName)
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, moduleText := range moduleTexts {
|
|
|
|
// convert from "a:b,c" to ["a", "b,c"]
|
|
|
|
components := strings.Split(moduleText, ":")
|
|
|
|
if len(components) != 2 {
|
|
|
|
panic(fmt.Sprintf("illegal module dep string %q from larger string %q; must contain one ':', not %v", moduleText, text, len(components)-1))
|
|
|
|
}
|
|
|
|
moduleName := components[0]
|
|
|
|
moduleOutput := outputForModuleName(moduleName)
|
|
|
|
modulesInOrder = append(modulesInOrder, moduleOutput)
|
|
|
|
|
|
|
|
depString := components[1]
|
|
|
|
// convert from "b,c" to ["b", "c"]
|
|
|
|
depNames := strings.Split(depString, ",")
|
|
|
|
if len(depString) < 1 {
|
|
|
|
depNames = []string{}
|
|
|
|
}
|
|
|
|
var deps []android.Path
|
|
|
|
for _, depName := range depNames {
|
|
|
|
deps = append(deps, outputForModuleName(depName))
|
|
|
|
}
|
|
|
|
allDeps[moduleOutput] = deps
|
|
|
|
}
|
|
|
|
return modulesInOrder, allDeps
|
|
|
|
}
|
|
|
|
|
|
|
|
func getOutputPaths(ctx *android.TestContext, variant string, moduleNames []string) (paths android.Paths) {
|
|
|
|
for _, moduleName := range moduleNames {
|
|
|
|
module := ctx.ModuleForTests(moduleName, variant).Module().(*Module)
|
|
|
|
output := module.outputFile.Path()
|
|
|
|
paths = append(paths, output)
|
|
|
|
}
|
|
|
|
return paths
|
|
|
|
}
|
|
|
|
|
2017-11-28 00:48:57 +01:00
|
|
|
func TestStaticLibDepReordering(t *testing.T) {
|
2017-09-28 02:05:30 +02:00
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "a",
|
|
|
|
static_libs: ["b", "c", "d"],
|
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
|
|
|
stl: "none",
|
2017-09-28 02:05:30 +02:00
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "b",
|
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
|
|
|
stl: "none",
|
2017-09-28 02:05:30 +02:00
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "c",
|
|
|
|
static_libs: ["b"],
|
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
|
|
|
stl: "none",
|
2017-09-28 02:05:30 +02:00
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "d",
|
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
|
|
|
stl: "none",
|
2017-09-28 02:05:30 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
`)
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
variant := "android_arm64_armv8-a_static"
|
2017-09-28 02:05:30 +02:00
|
|
|
moduleA := ctx.ModuleForTests("a", variant).Module().(*Module)
|
2020-09-18 23:15:30 +02:00
|
|
|
actual := ctx.ModuleProvider(moduleA, StaticLibraryInfoProvider).(StaticLibraryInfo).TransitiveStaticLibrariesForOrdering.ToList()
|
|
|
|
expected := getOutputPaths(ctx, variant, []string{"a", "c", "b", "d"})
|
2017-09-28 02:05:30 +02:00
|
|
|
|
|
|
|
if !reflect.DeepEqual(actual, expected) {
|
|
|
|
t.Errorf("staticDeps orderings were not propagated correctly"+
|
|
|
|
"\nactual: %v"+
|
|
|
|
"\nexpected: %v",
|
|
|
|
actual,
|
|
|
|
expected,
|
|
|
|
)
|
|
|
|
}
|
2017-09-26 03:50:54 +02:00
|
|
|
}
|
2017-09-28 02:05:30 +02:00
|
|
|
|
2017-11-28 00:48:57 +01:00
|
|
|
func TestStaticLibDepReorderingWithShared(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "a",
|
|
|
|
static_libs: ["b", "c"],
|
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
|
|
|
stl: "none",
|
2017-11-28 00:48:57 +01:00
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "b",
|
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
|
|
|
stl: "none",
|
2017-11-28 00:48:57 +01:00
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "c",
|
|
|
|
shared_libs: ["b"],
|
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
|
|
|
stl: "none",
|
2017-11-28 00:48:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
`)
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
variant := "android_arm64_armv8-a_static"
|
2017-11-28 00:48:57 +01:00
|
|
|
moduleA := ctx.ModuleForTests("a", variant).Module().(*Module)
|
2020-09-18 23:15:30 +02:00
|
|
|
actual := ctx.ModuleProvider(moduleA, StaticLibraryInfoProvider).(StaticLibraryInfo).TransitiveStaticLibrariesForOrdering.ToList()
|
|
|
|
expected := getOutputPaths(ctx, variant, []string{"a", "c", "b"})
|
2017-11-28 00:48:57 +01:00
|
|
|
|
|
|
|
if !reflect.DeepEqual(actual, expected) {
|
|
|
|
t.Errorf("staticDeps orderings did not account for shared libs"+
|
|
|
|
"\nactual: %v"+
|
|
|
|
"\nexpected: %v",
|
|
|
|
actual,
|
|
|
|
expected,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-13 10:57:35 +01:00
|
|
|
func checkEquals(t *testing.T, message string, expected, actual interface{}) {
|
2020-08-19 03:35:15 +02:00
|
|
|
t.Helper()
|
2020-03-13 10:57:35 +01:00
|
|
|
if !reflect.DeepEqual(actual, expected) {
|
|
|
|
t.Errorf(message+
|
|
|
|
"\nactual: %v"+
|
|
|
|
"\nexpected: %v",
|
|
|
|
actual,
|
|
|
|
expected,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-21 15:21:46 +01:00
|
|
|
func TestLlndkLibrary(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
stubs: { versions: ["1", "2"] },
|
2020-10-14 03:43:54 +02:00
|
|
|
llndk_stubs: "libllndk.llndk",
|
2020-03-21 15:21:46 +01:00
|
|
|
}
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2020-03-21 15:21:46 +01:00
|
|
|
}
|
2020-12-17 01:46:01 +01:00
|
|
|
|
|
|
|
cc_prebuilt_library_shared {
|
|
|
|
name: "libllndkprebuilt",
|
|
|
|
stubs: { versions: ["1", "2"] },
|
|
|
|
llndk_stubs: "libllndkprebuilt.llndk",
|
|
|
|
}
|
|
|
|
llndk_library {
|
|
|
|
name: "libllndkprebuilt.llndk",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libllndk_with_external_headers",
|
|
|
|
stubs: { versions: ["1", "2"] },
|
|
|
|
llndk_stubs: "libllndk_with_external_headers.llndk",
|
|
|
|
header_libs: ["libexternal_headers"],
|
|
|
|
export_header_lib_headers: ["libexternal_headers"],
|
|
|
|
}
|
|
|
|
llndk_library {
|
|
|
|
name: "libllndk_with_external_headers.llndk",
|
|
|
|
}
|
|
|
|
cc_library_headers {
|
|
|
|
name: "libexternal_headers",
|
|
|
|
export_include_dirs: ["include"],
|
|
|
|
vendor_available: true,
|
|
|
|
}
|
2020-03-21 15:21:46 +01:00
|
|
|
`)
|
2020-12-17 01:46:01 +01:00
|
|
|
actual := ctx.ModuleVariantsForTests("libllndk")
|
|
|
|
for i := 0; i < len(actual); i++ {
|
|
|
|
if !strings.HasPrefix(actual[i], "android_vendor.VER_") {
|
|
|
|
actual = append(actual[:i], actual[i+1:]...)
|
|
|
|
i--
|
|
|
|
}
|
|
|
|
}
|
2020-03-21 15:21:46 +01:00
|
|
|
expected := []string{
|
|
|
|
"android_vendor.VER_arm64_armv8-a_shared_1",
|
|
|
|
"android_vendor.VER_arm64_armv8-a_shared_2",
|
2020-09-18 23:15:30 +02:00
|
|
|
"android_vendor.VER_arm64_armv8-a_shared",
|
2020-03-21 15:21:46 +01:00
|
|
|
"android_vendor.VER_arm_armv7-a-neon_shared_1",
|
|
|
|
"android_vendor.VER_arm_armv7-a-neon_shared_2",
|
2020-09-18 23:15:30 +02:00
|
|
|
"android_vendor.VER_arm_armv7-a-neon_shared",
|
2020-03-21 15:21:46 +01:00
|
|
|
}
|
|
|
|
checkEquals(t, "variants for llndk stubs", expected, actual)
|
|
|
|
|
2020-12-17 01:46:01 +01:00
|
|
|
params := ctx.ModuleForTests("libllndk", "android_vendor.VER_arm_armv7-a-neon_shared").Description("generate stub")
|
2020-03-21 15:21:46 +01:00
|
|
|
checkEquals(t, "use VNDK version for default stubs", "current", params.Args["apiLevel"])
|
|
|
|
|
2020-12-17 01:46:01 +01:00
|
|
|
params = ctx.ModuleForTests("libllndk", "android_vendor.VER_arm_armv7-a-neon_shared_1").Description("generate stub")
|
2020-03-21 15:21:46 +01:00
|
|
|
checkEquals(t, "override apiLevel for versioned stubs", "1", params.Args["apiLevel"])
|
|
|
|
}
|
|
|
|
|
2017-12-14 11:54:34 +01:00
|
|
|
func TestLlndkHeaders(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
llndk_headers {
|
|
|
|
name: "libllndk_headers",
|
|
|
|
export_include_dirs: ["my_include"],
|
|
|
|
}
|
|
|
|
llndk_library {
|
2020-10-14 03:43:54 +02:00
|
|
|
name: "libllndk.llndk",
|
2017-12-14 11:54:34 +01:00
|
|
|
export_llndk_headers: ["libllndk_headers"],
|
|
|
|
}
|
2020-10-14 03:43:54 +02:00
|
|
|
cc_library {
|
|
|
|
name: "libllndk",
|
|
|
|
llndk_stubs: "libllndk.llndk",
|
|
|
|
}
|
|
|
|
|
2017-12-14 11:54:34 +01:00
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
shared_libs: ["libllndk"],
|
|
|
|
vendor: true,
|
|
|
|
srcs: ["foo.c"],
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt: true,
|
Support VNDK extensions
This commit adds `extends: "name"` property and provides basic support
to VNDK extensions. This is the simplest example:
```
cc_library {
name: "libvndk",
vendor_available: true,
vndk {
enabled: true,
},
}
cc_library {
name: "libvndk_ext",
vendor: true,
vndk: {
enabled: true,
extends: "libvndk",
},
}
```
A vndk extension library must extend an existing vndk library which has
`vendor_available: true`. These two libraries must have the same
`support_system_process` property.
VNDK-ext libraries are installed to `/vendor/lib[64]/vndk` and
VNDK-SP-ext libraries are installed to `/vendor/lib[64]/vndk-sp` by
default.
If there is a matching abi-dumps in `prebuilts/abi-dumps`,
`header-abi-diff` will be invoked to check for ABI breakages.
Bug: 38340960
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_arm-userdebug && make -j8 # build a target w/o VNDK
Test: Create a lsdump for a vndk lib, add an exported API to vndk lib,
and build fails as expected.
Test: Create a lsdump for a vndk lib, create an vndk extension lib with
extra API, and build succeeds as expected.
Test: Create libutils_ext, add an extra function to libutils_ext, and
call it from a HIDL service.
Change-Id: Iba90e08848ee99814405457f047321e6b52b2df0
2017-10-31 11:04:35 +01:00
|
|
|
nocrt: true,
|
2017-12-14 11:54:34 +01:00
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
// _static variant is used since _shared reuses *.o from the static variant
|
2019-11-21 02:12:35 +01:00
|
|
|
cc := ctx.ModuleForTests("libvendor", "android_vendor.VER_arm_armv7-a-neon_static").Rule("cc")
|
2017-12-14 11:54:34 +01:00
|
|
|
cflags := cc.Args["cFlags"]
|
|
|
|
if !strings.Contains(cflags, "-Imy_include") {
|
|
|
|
t.Errorf("cflags for libvendor must contain -Imy_include, but was %#v.", cflags)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-19 18:17:32 +01:00
|
|
|
func checkRuntimeLibs(t *testing.T, expected []string, module *Module) {
|
|
|
|
actual := module.Properties.AndroidMkRuntimeLibs
|
|
|
|
if !reflect.DeepEqual(actual, expected) {
|
|
|
|
t.Errorf("incorrect runtime_libs for shared libs"+
|
|
|
|
"\nactual: %v"+
|
|
|
|
"\nexpected: %v",
|
|
|
|
actual,
|
|
|
|
expected,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const runtimeLibAndroidBp = `
|
|
|
|
cc_library {
|
2020-12-07 04:44:03 +01:00
|
|
|
name: "liball_available",
|
2017-12-19 18:17:32 +01:00
|
|
|
vendor_available: true,
|
2020-12-07 04:44:03 +01:00
|
|
|
product_available: true,
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt : true,
|
2017-12-19 18:17:32 +01:00
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
cc_library {
|
2020-12-07 04:44:03 +01:00
|
|
|
name: "libvendor_available1",
|
2017-12-19 18:17:32 +01:00
|
|
|
vendor_available: true,
|
2020-12-07 04:44:03 +01:00
|
|
|
runtime_libs: ["liball_available"],
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt : true,
|
2017-12-19 18:17:32 +01:00
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
cc_library {
|
2020-12-07 04:44:03 +01:00
|
|
|
name: "libvendor_available2",
|
2017-12-19 18:17:32 +01:00
|
|
|
vendor_available: true,
|
2020-12-07 04:44:03 +01:00
|
|
|
runtime_libs: ["liball_available"],
|
2017-12-19 18:17:32 +01:00
|
|
|
target: {
|
|
|
|
vendor: {
|
2020-12-07 04:44:03 +01:00
|
|
|
exclude_runtime_libs: ["liball_available"],
|
2017-12-19 18:17:32 +01:00
|
|
|
}
|
|
|
|
},
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt : true,
|
2017-12-19 18:17:32 +01:00
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libcore",
|
2020-12-07 04:44:03 +01:00
|
|
|
runtime_libs: ["liball_available"],
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt : true,
|
2017-12-19 18:17:32 +01:00
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor1",
|
|
|
|
vendor: true,
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt : true,
|
2017-12-19 18:17:32 +01:00
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor2",
|
|
|
|
vendor: true,
|
2020-12-07 04:44:03 +01:00
|
|
|
runtime_libs: ["liball_available", "libvendor1"],
|
|
|
|
no_libcrt : true,
|
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libproduct_available1",
|
|
|
|
product_available: true,
|
|
|
|
runtime_libs: ["liball_available"],
|
|
|
|
no_libcrt : true,
|
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libproduct1",
|
|
|
|
product_specific: true,
|
|
|
|
no_libcrt : true,
|
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libproduct2",
|
|
|
|
product_specific: true,
|
|
|
|
runtime_libs: ["liball_available", "libproduct1"],
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt : true,
|
2017-12-19 18:17:32 +01:00
|
|
|
nocrt : true,
|
|
|
|
system_shared_libs : [],
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
func TestRuntimeLibs(t *testing.T) {
|
|
|
|
ctx := testCc(t, runtimeLibAndroidBp)
|
|
|
|
|
|
|
|
// runtime_libs for core variants use the module names without suffixes.
|
2019-11-21 01:39:12 +01:00
|
|
|
variant := "android_arm64_armv8-a_shared"
|
2017-12-19 18:17:32 +01:00
|
|
|
|
2020-12-07 04:44:03 +01:00
|
|
|
module := ctx.ModuleForTests("libvendor_available1", variant).Module().(*Module)
|
|
|
|
checkRuntimeLibs(t, []string{"liball_available"}, module)
|
|
|
|
|
|
|
|
module = ctx.ModuleForTests("libproduct_available1", variant).Module().(*Module)
|
|
|
|
checkRuntimeLibs(t, []string{"liball_available"}, module)
|
2017-12-19 18:17:32 +01:00
|
|
|
|
|
|
|
module = ctx.ModuleForTests("libcore", variant).Module().(*Module)
|
2020-12-07 04:44:03 +01:00
|
|
|
checkRuntimeLibs(t, []string{"liball_available"}, module)
|
2017-12-19 18:17:32 +01:00
|
|
|
|
|
|
|
// runtime_libs for vendor variants have '.vendor' suffixes if the modules have both core
|
|
|
|
// and vendor variants.
|
2019-11-21 02:12:35 +01:00
|
|
|
variant = "android_vendor.VER_arm64_armv8-a_shared"
|
2017-12-19 18:17:32 +01:00
|
|
|
|
2020-12-07 04:44:03 +01:00
|
|
|
module = ctx.ModuleForTests("libvendor_available1", variant).Module().(*Module)
|
|
|
|
checkRuntimeLibs(t, []string{"liball_available.vendor"}, module)
|
2017-12-19 18:17:32 +01:00
|
|
|
|
|
|
|
module = ctx.ModuleForTests("libvendor2", variant).Module().(*Module)
|
2020-12-07 04:44:03 +01:00
|
|
|
checkRuntimeLibs(t, []string{"liball_available.vendor", "libvendor1"}, module)
|
|
|
|
|
|
|
|
// runtime_libs for product variants have '.product' suffixes if the modules have both core
|
|
|
|
// and product variants.
|
|
|
|
variant = "android_product.VER_arm64_armv8-a_shared"
|
|
|
|
|
|
|
|
module = ctx.ModuleForTests("libproduct_available1", variant).Module().(*Module)
|
|
|
|
checkRuntimeLibs(t, []string{"liball_available.product"}, module)
|
|
|
|
|
|
|
|
module = ctx.ModuleForTests("libproduct2", variant).Module().(*Module)
|
|
|
|
checkRuntimeLibs(t, []string{"liball_available.product", "libproduct1"}, module)
|
2017-12-19 18:17:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func TestExcludeRuntimeLibs(t *testing.T) {
|
|
|
|
ctx := testCc(t, runtimeLibAndroidBp)
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
variant := "android_arm64_armv8-a_shared"
|
2020-12-07 04:44:03 +01:00
|
|
|
module := ctx.ModuleForTests("libvendor_available2", variant).Module().(*Module)
|
|
|
|
checkRuntimeLibs(t, []string{"liball_available"}, module)
|
2017-12-19 18:17:32 +01:00
|
|
|
|
2019-11-21 02:12:35 +01:00
|
|
|
variant = "android_vendor.VER_arm64_armv8-a_shared"
|
2020-12-07 04:44:03 +01:00
|
|
|
module = ctx.ModuleForTests("libvendor_available2", variant).Module().(*Module)
|
2017-12-19 18:17:32 +01:00
|
|
|
checkRuntimeLibs(t, nil, module)
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestRuntimeLibsNoVndk(t *testing.T) {
|
|
|
|
ctx := testCcNoVndk(t, runtimeLibAndroidBp)
|
|
|
|
|
|
|
|
// If DeviceVndkVersion is not defined, then runtime_libs are copied as-is.
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
variant := "android_arm64_armv8-a_shared"
|
2017-12-19 18:17:32 +01:00
|
|
|
|
2020-12-07 04:44:03 +01:00
|
|
|
module := ctx.ModuleForTests("libvendor_available1", variant).Module().(*Module)
|
|
|
|
checkRuntimeLibs(t, []string{"liball_available"}, module)
|
2017-12-19 18:17:32 +01:00
|
|
|
|
|
|
|
module = ctx.ModuleForTests("libvendor2", variant).Module().(*Module)
|
2020-12-07 04:44:03 +01:00
|
|
|
checkRuntimeLibs(t, []string{"liball_available", "libvendor1"}, module)
|
|
|
|
|
|
|
|
module = ctx.ModuleForTests("libproduct2", variant).Module().(*Module)
|
|
|
|
checkRuntimeLibs(t, []string{"liball_available", "libproduct1"}, module)
|
2017-12-19 18:17:32 +01:00
|
|
|
}
|
|
|
|
|
2018-11-16 02:19:56 +01:00
|
|
|
func checkStaticLibs(t *testing.T, expected []string, module *Module) {
|
2020-02-26 14:45:42 +01:00
|
|
|
t.Helper()
|
2018-11-16 02:19:56 +01:00
|
|
|
actual := module.Properties.AndroidMkStaticLibs
|
|
|
|
if !reflect.DeepEqual(actual, expected) {
|
|
|
|
t.Errorf("incorrect static_libs"+
|
|
|
|
"\nactual: %v"+
|
|
|
|
"\nexpected: %v",
|
|
|
|
actual,
|
|
|
|
expected,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const staticLibAndroidBp = `
|
|
|
|
cc_library {
|
|
|
|
name: "lib1",
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "lib2",
|
|
|
|
static_libs: ["lib1"],
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
func TestStaticLibDepExport(t *testing.T) {
|
|
|
|
ctx := testCc(t, staticLibAndroidBp)
|
|
|
|
|
|
|
|
// Check the shared version of lib2.
|
2019-11-21 01:39:12 +01:00
|
|
|
variant := "android_arm64_armv8-a_shared"
|
2018-11-16 02:19:56 +01:00
|
|
|
module := ctx.ModuleForTests("lib2", variant).Module().(*Module)
|
2019-12-11 03:37:45 +01:00
|
|
|
checkStaticLibs(t, []string{"lib1", "libc++demangle", "libclang_rt.builtins-aarch64-android", "libatomic"}, module)
|
2018-11-16 02:19:56 +01:00
|
|
|
|
|
|
|
// Check the static version of lib2.
|
2019-11-21 01:39:12 +01:00
|
|
|
variant = "android_arm64_armv8-a_static"
|
2018-11-16 02:19:56 +01:00
|
|
|
module = ctx.ModuleForTests("lib2", variant).Module().(*Module)
|
|
|
|
// libc++_static is linked additionally.
|
2019-12-11 03:37:45 +01:00
|
|
|
checkStaticLibs(t, []string{"lib1", "libc++_static", "libc++demangle", "libclang_rt.builtins-aarch64-android", "libatomic"}, module)
|
2018-11-16 02:19:56 +01:00
|
|
|
}
|
|
|
|
|
2017-09-26 03:50:54 +02:00
|
|
|
var compilerFlagsTestCases = []struct {
|
|
|
|
in string
|
|
|
|
out bool
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
in: "a",
|
|
|
|
out: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-a",
|
|
|
|
out: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-Ipath/to/something",
|
|
|
|
out: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-isystempath/to/something",
|
|
|
|
out: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "--coverage",
|
|
|
|
out: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-include a/b",
|
|
|
|
out: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-include a/b c/d",
|
|
|
|
out: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-DMACRO",
|
|
|
|
out: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-DMAC RO",
|
|
|
|
out: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-a -b",
|
|
|
|
out: false,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-DMACRO=definition",
|
|
|
|
out: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-DMACRO=defi nition",
|
|
|
|
out: true, // TODO(jiyong): this should be false
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-DMACRO(x)=x + 1",
|
|
|
|
out: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
in: "-DMACRO=\"defi nition\"",
|
|
|
|
out: true,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
type mockContext struct {
|
|
|
|
BaseModuleContext
|
|
|
|
result bool
|
|
|
|
}
|
|
|
|
|
|
|
|
func (ctx *mockContext) PropertyErrorf(property, format string, args ...interface{}) {
|
|
|
|
// CheckBadCompilerFlags calls this function when the flag should be rejected
|
|
|
|
ctx.result = false
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestCompilerFlags(t *testing.T) {
|
|
|
|
for _, testCase := range compilerFlagsTestCases {
|
|
|
|
ctx := &mockContext{result: true}
|
|
|
|
CheckBadCompilerFlags(ctx, "", []string{testCase.in})
|
|
|
|
if ctx.result != testCase.out {
|
|
|
|
t.Errorf("incorrect output:")
|
|
|
|
t.Errorf(" input: %#v", testCase.in)
|
|
|
|
t.Errorf(" expected: %#v", testCase.out)
|
|
|
|
t.Errorf(" got: %#v", ctx.result)
|
|
|
|
}
|
|
|
|
}
|
2017-09-28 02:05:30 +02:00
|
|
|
}
|
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 TestVendorPublicLibraries(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library_headers {
|
|
|
|
name: "libvendorpublic_headers",
|
|
|
|
export_include_dirs: ["my_include"],
|
|
|
|
}
|
|
|
|
vendor_public_library {
|
|
|
|
name: "libvendorpublic",
|
|
|
|
symbol_file: "",
|
|
|
|
export_public_headers: ["libvendorpublic_headers"],
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvendorpublic",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
vendor: true,
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt: true,
|
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
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libsystem",
|
|
|
|
shared_libs: ["libvendorpublic"],
|
|
|
|
vendor: false,
|
|
|
|
srcs: ["foo.c"],
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt: true,
|
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
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
cc_library {
|
|
|
|
name: "libvendor",
|
|
|
|
shared_libs: ["libvendorpublic"],
|
|
|
|
vendor: true,
|
|
|
|
srcs: ["foo.c"],
|
2019-06-02 09:53:50 +02:00
|
|
|
no_libcrt: true,
|
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
|
|
|
nocrt: true,
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
coreVariant := "android_arm64_armv8-a_shared"
|
2019-11-21 02:12:35 +01:00
|
|
|
vendorVariant := "android_vendor.VER_arm64_armv8-a_shared"
|
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
|
|
|
|
|
|
|
// test if header search paths are correctly added
|
|
|
|
// _static variant is used since _shared reuses *.o from the static variant
|
2019-11-21 01:39:12 +01:00
|
|
|
cc := ctx.ModuleForTests("libsystem", strings.Replace(coreVariant, "_shared", "_static", 1)).Rule("cc")
|
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
|
|
|
cflags := cc.Args["cFlags"]
|
|
|
|
if !strings.Contains(cflags, "-Imy_include") {
|
|
|
|
t.Errorf("cflags for libsystem must contain -Imy_include, but was %#v.", cflags)
|
|
|
|
}
|
|
|
|
|
|
|
|
// test if libsystem is linked to the stub
|
2019-11-21 01:39:12 +01:00
|
|
|
ld := ctx.ModuleForTests("libsystem", coreVariant).Rule("ld")
|
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
|
|
|
libflags := ld.Args["libFlags"]
|
2019-11-21 01:39:12 +01:00
|
|
|
stubPaths := getOutputPaths(ctx, coreVariant, []string{"libvendorpublic" + vendorPublicLibrarySuffix})
|
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
|
|
|
if !strings.Contains(libflags, stubPaths[0].String()) {
|
|
|
|
t.Errorf("libflags for libsystem must contain %#v, but was %#v", stubPaths[0], libflags)
|
|
|
|
}
|
|
|
|
|
|
|
|
// test if libvendor is linked to the real shared lib
|
2019-11-21 01:39:12 +01:00
|
|
|
ld = ctx.ModuleForTests("libvendor", vendorVariant).Rule("ld")
|
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
|
|
|
libflags = ld.Args["libFlags"]
|
2019-11-21 01:39:12 +01:00
|
|
|
stubPaths = getOutputPaths(ctx, vendorVariant, []string{"libvendorpublic"})
|
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
|
|
|
if !strings.Contains(libflags, stubPaths[0].String()) {
|
|
|
|
t.Errorf("libflags for libvendor must contain %#v, but was %#v", stubPaths[0], libflags)
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2018-07-11 03:49:27 +02:00
|
|
|
|
|
|
|
func TestRecovery(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "librecovery",
|
|
|
|
recovery: true,
|
|
|
|
}
|
|
|
|
cc_library_shared {
|
|
|
|
name: "librecovery32",
|
|
|
|
recovery: true,
|
|
|
|
compile_multilib:"32",
|
|
|
|
}
|
2018-08-28 02:55:37 +02:00
|
|
|
cc_library_shared {
|
|
|
|
name: "libHalInRecovery",
|
|
|
|
recovery_available: true,
|
|
|
|
vendor: true,
|
|
|
|
}
|
2018-07-11 03:49:27 +02:00
|
|
|
`)
|
|
|
|
|
|
|
|
variants := ctx.ModuleVariantsForTests("librecovery")
|
2019-11-21 02:12:35 +01:00
|
|
|
const arm64 = "android_recovery_arm64_armv8-a_shared"
|
2018-07-11 03:49:27 +02:00
|
|
|
if len(variants) != 1 || !android.InList(arm64, variants) {
|
|
|
|
t.Errorf("variants of librecovery must be \"%s\" only, but was %#v", arm64, variants)
|
|
|
|
}
|
|
|
|
|
|
|
|
variants = ctx.ModuleVariantsForTests("librecovery32")
|
|
|
|
if android.InList(arm64, variants) {
|
|
|
|
t.Errorf("multilib was set to 32 for librecovery32, but its variants has %s.", arm64)
|
|
|
|
}
|
2018-08-28 02:55:37 +02:00
|
|
|
|
|
|
|
recoveryModule := ctx.ModuleForTests("libHalInRecovery", recoveryVariant).Module().(*Module)
|
|
|
|
if !recoveryModule.Platform() {
|
|
|
|
t.Errorf("recovery variant of libHalInRecovery must not specific to device, soc, or product")
|
|
|
|
}
|
Add support for versioned stubs.
A cc_library or cc_library_shared can be configured to have stubs
variants of the lib.
cc_library_shared {
name: "libfoo",
srcs: ["foo.cpp"],
stubs: {
symbol_file: "foo.map.txt",
versions: ["1", "2", "3"],
},
}
then, stubs variants of libfoo for version 1, 2, and 3 are created
from foo.map.txt. Each version has the symbols from the map file where
each symbol is annotated with the version that the symbol was introduced
via the 'introduced=<ver>' syntax. The versions don't need to be in sync
with the platform versions (e.g., P for 28). The versions are local to
the library.
For another library or executable to use the versioned stubs lib, use
the new 'name#ver' syntax to specify the version:
cc_binary {
name: "test",
....
shared_libs: ["libFoo#2"],
}
Internally, a new mutator 'version' is applied to all cc.Module objects.
By default, a variant named 'impl' is created for the non-stub version.
If the versions property is set, additional variations are created per a
version with the mutable property BuildStubs set as true, which lets the
compiler and the linker to build a stubs lib from the symbol file
instead from the source files.
This feature will be used to enforce stable interfaces among APEXs. When
a lib foo in an APEX is depending on a lib bar in another APEX, then bar
should have stable interface (in C lang) and foo should be depending on
one of the stubs libs of bar. Only libraries in the same APEX as foo can
link against non-stub version of it.
Bug: 112672359
Test: m (cc_test added)
Change-Id: I2488be0b9d7b7b8d7761234dc1c9c0e3add8601c
2018-10-15 15:25:07 +02:00
|
|
|
}
|
2018-08-28 02:55:37 +02:00
|
|
|
|
2020-06-17 22:10:42 +02:00
|
|
|
func TestDataLibsPrebuiltSharedTestLibrary(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
cc_prebuilt_test_library_shared {
|
|
|
|
name: "test_lib",
|
|
|
|
relative_install_path: "foo/bar/baz",
|
|
|
|
srcs: ["srcpath/dontusethispath/baz.so"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_test {
|
|
|
|
name: "main_test",
|
|
|
|
data_libs: ["test_lib"],
|
|
|
|
gtest: false,
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
|
|
|
|
config.TestProductVariables.Platform_vndk_version = StringPtr("VER")
|
|
|
|
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
|
|
|
|
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
module := ctx.ModuleForTests("main_test", "android_arm_armv7-a-neon").Module()
|
|
|
|
testBinary := module.(*Module).linker.(*testBinary)
|
|
|
|
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
|
|
|
|
if err != nil {
|
|
|
|
t.Fatalf("Expected cc_test to produce output files, error: %s", err)
|
|
|
|
}
|
|
|
|
if len(outputFiles) != 1 {
|
|
|
|
t.Errorf("expected exactly one output file. output files: [%s]", outputFiles)
|
|
|
|
}
|
|
|
|
if len(testBinary.dataPaths()) != 1 {
|
|
|
|
t.Errorf("expected exactly one test data file. test data files: [%s]", testBinary.dataPaths())
|
|
|
|
}
|
|
|
|
|
|
|
|
outputPath := outputFiles[0].String()
|
|
|
|
|
|
|
|
if !strings.HasSuffix(outputPath, "/main_test") {
|
|
|
|
t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath)
|
|
|
|
}
|
|
|
|
entries := android.AndroidMkEntriesForTest(t, config, "", module)[0]
|
|
|
|
if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:foo/bar/baz") {
|
|
|
|
t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:foo/bar/baz`,"+
|
|
|
|
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][0])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Add support for versioned stubs.
A cc_library or cc_library_shared can be configured to have stubs
variants of the lib.
cc_library_shared {
name: "libfoo",
srcs: ["foo.cpp"],
stubs: {
symbol_file: "foo.map.txt",
versions: ["1", "2", "3"],
},
}
then, stubs variants of libfoo for version 1, 2, and 3 are created
from foo.map.txt. Each version has the symbols from the map file where
each symbol is annotated with the version that the symbol was introduced
via the 'introduced=<ver>' syntax. The versions don't need to be in sync
with the platform versions (e.g., P for 28). The versions are local to
the library.
For another library or executable to use the versioned stubs lib, use
the new 'name#ver' syntax to specify the version:
cc_binary {
name: "test",
....
shared_libs: ["libFoo#2"],
}
Internally, a new mutator 'version' is applied to all cc.Module objects.
By default, a variant named 'impl' is created for the non-stub version.
If the versions property is set, additional variations are created per a
version with the mutable property BuildStubs set as true, which lets the
compiler and the linker to build a stubs lib from the symbol file
instead from the source files.
This feature will be used to enforce stable interfaces among APEXs. When
a lib foo in an APEX is depending on a lib bar in another APEX, then bar
should have stable interface (in C lang) and foo should be depending on
one of the stubs libs of bar. Only libraries in the same APEX as foo can
link against non-stub version of it.
Bug: 112672359
Test: m (cc_test added)
Change-Id: I2488be0b9d7b7b8d7761234dc1c9c0e3add8601c
2018-10-15 15:25:07 +02:00
|
|
|
func TestVersionedStubs(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libFoo",
|
2018-11-02 10:23:15 +01:00
|
|
|
srcs: ["foo.c"],
|
Add support for versioned stubs.
A cc_library or cc_library_shared can be configured to have stubs
variants of the lib.
cc_library_shared {
name: "libfoo",
srcs: ["foo.cpp"],
stubs: {
symbol_file: "foo.map.txt",
versions: ["1", "2", "3"],
},
}
then, stubs variants of libfoo for version 1, 2, and 3 are created
from foo.map.txt. Each version has the symbols from the map file where
each symbol is annotated with the version that the symbol was introduced
via the 'introduced=<ver>' syntax. The versions don't need to be in sync
with the platform versions (e.g., P for 28). The versions are local to
the library.
For another library or executable to use the versioned stubs lib, use
the new 'name#ver' syntax to specify the version:
cc_binary {
name: "test",
....
shared_libs: ["libFoo#2"],
}
Internally, a new mutator 'version' is applied to all cc.Module objects.
By default, a variant named 'impl' is created for the non-stub version.
If the versions property is set, additional variations are created per a
version with the mutable property BuildStubs set as true, which lets the
compiler and the linker to build a stubs lib from the symbol file
instead from the source files.
This feature will be used to enforce stable interfaces among APEXs. When
a lib foo in an APEX is depending on a lib bar in another APEX, then bar
should have stable interface (in C lang) and foo should be depending on
one of the stubs libs of bar. Only libraries in the same APEX as foo can
link against non-stub version of it.
Bug: 112672359
Test: m (cc_test added)
Change-Id: I2488be0b9d7b7b8d7761234dc1c9c0e3add8601c
2018-10-15 15:25:07 +02:00
|
|
|
stubs: {
|
|
|
|
symbol_file: "foo.map.txt",
|
|
|
|
versions: ["1", "2", "3"],
|
|
|
|
},
|
|
|
|
}
|
2018-11-02 10:23:15 +01:00
|
|
|
|
Add support for versioned stubs.
A cc_library or cc_library_shared can be configured to have stubs
variants of the lib.
cc_library_shared {
name: "libfoo",
srcs: ["foo.cpp"],
stubs: {
symbol_file: "foo.map.txt",
versions: ["1", "2", "3"],
},
}
then, stubs variants of libfoo for version 1, 2, and 3 are created
from foo.map.txt. Each version has the symbols from the map file where
each symbol is annotated with the version that the symbol was introduced
via the 'introduced=<ver>' syntax. The versions don't need to be in sync
with the platform versions (e.g., P for 28). The versions are local to
the library.
For another library or executable to use the versioned stubs lib, use
the new 'name#ver' syntax to specify the version:
cc_binary {
name: "test",
....
shared_libs: ["libFoo#2"],
}
Internally, a new mutator 'version' is applied to all cc.Module objects.
By default, a variant named 'impl' is created for the non-stub version.
If the versions property is set, additional variations are created per a
version with the mutable property BuildStubs set as true, which lets the
compiler and the linker to build a stubs lib from the symbol file
instead from the source files.
This feature will be used to enforce stable interfaces among APEXs. When
a lib foo in an APEX is depending on a lib bar in another APEX, then bar
should have stable interface (in C lang) and foo should be depending on
one of the stubs libs of bar. Only libraries in the same APEX as foo can
link against non-stub version of it.
Bug: 112672359
Test: m (cc_test added)
Change-Id: I2488be0b9d7b7b8d7761234dc1c9c0e3add8601c
2018-10-15 15:25:07 +02:00
|
|
|
cc_library_shared {
|
|
|
|
name: "libBar",
|
2018-11-02 10:23:15 +01:00
|
|
|
srcs: ["bar.c"],
|
Add support for versioned stubs.
A cc_library or cc_library_shared can be configured to have stubs
variants of the lib.
cc_library_shared {
name: "libfoo",
srcs: ["foo.cpp"],
stubs: {
symbol_file: "foo.map.txt",
versions: ["1", "2", "3"],
},
}
then, stubs variants of libfoo for version 1, 2, and 3 are created
from foo.map.txt. Each version has the symbols from the map file where
each symbol is annotated with the version that the symbol was introduced
via the 'introduced=<ver>' syntax. The versions don't need to be in sync
with the platform versions (e.g., P for 28). The versions are local to
the library.
For another library or executable to use the versioned stubs lib, use
the new 'name#ver' syntax to specify the version:
cc_binary {
name: "test",
....
shared_libs: ["libFoo#2"],
}
Internally, a new mutator 'version' is applied to all cc.Module objects.
By default, a variant named 'impl' is created for the non-stub version.
If the versions property is set, additional variations are created per a
version with the mutable property BuildStubs set as true, which lets the
compiler and the linker to build a stubs lib from the symbol file
instead from the source files.
This feature will be used to enforce stable interfaces among APEXs. When
a lib foo in an APEX is depending on a lib bar in another APEX, then bar
should have stable interface (in C lang) and foo should be depending on
one of the stubs libs of bar. Only libraries in the same APEX as foo can
link against non-stub version of it.
Bug: 112672359
Test: m (cc_test added)
Change-Id: I2488be0b9d7b7b8d7761234dc1c9c0e3add8601c
2018-10-15 15:25:07 +02:00
|
|
|
shared_libs: ["libFoo#1"],
|
|
|
|
}`)
|
|
|
|
|
|
|
|
variants := ctx.ModuleVariantsForTests("libFoo")
|
|
|
|
expectedVariants := []string{
|
2019-11-21 01:39:12 +01:00
|
|
|
"android_arm64_armv8-a_shared",
|
|
|
|
"android_arm64_armv8-a_shared_1",
|
|
|
|
"android_arm64_armv8-a_shared_2",
|
|
|
|
"android_arm64_armv8-a_shared_3",
|
|
|
|
"android_arm_armv7-a-neon_shared",
|
|
|
|
"android_arm_armv7-a-neon_shared_1",
|
|
|
|
"android_arm_armv7-a-neon_shared_2",
|
|
|
|
"android_arm_armv7-a-neon_shared_3",
|
Add support for versioned stubs.
A cc_library or cc_library_shared can be configured to have stubs
variants of the lib.
cc_library_shared {
name: "libfoo",
srcs: ["foo.cpp"],
stubs: {
symbol_file: "foo.map.txt",
versions: ["1", "2", "3"],
},
}
then, stubs variants of libfoo for version 1, 2, and 3 are created
from foo.map.txt. Each version has the symbols from the map file where
each symbol is annotated with the version that the symbol was introduced
via the 'introduced=<ver>' syntax. The versions don't need to be in sync
with the platform versions (e.g., P for 28). The versions are local to
the library.
For another library or executable to use the versioned stubs lib, use
the new 'name#ver' syntax to specify the version:
cc_binary {
name: "test",
....
shared_libs: ["libFoo#2"],
}
Internally, a new mutator 'version' is applied to all cc.Module objects.
By default, a variant named 'impl' is created for the non-stub version.
If the versions property is set, additional variations are created per a
version with the mutable property BuildStubs set as true, which lets the
compiler and the linker to build a stubs lib from the symbol file
instead from the source files.
This feature will be used to enforce stable interfaces among APEXs. When
a lib foo in an APEX is depending on a lib bar in another APEX, then bar
should have stable interface (in C lang) and foo should be depending on
one of the stubs libs of bar. Only libraries in the same APEX as foo can
link against non-stub version of it.
Bug: 112672359
Test: m (cc_test added)
Change-Id: I2488be0b9d7b7b8d7761234dc1c9c0e3add8601c
2018-10-15 15:25:07 +02:00
|
|
|
}
|
|
|
|
variantsMismatch := false
|
|
|
|
if len(variants) != len(expectedVariants) {
|
|
|
|
variantsMismatch = true
|
|
|
|
} else {
|
|
|
|
for _, v := range expectedVariants {
|
|
|
|
if !inList(v, variants) {
|
|
|
|
variantsMismatch = false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if variantsMismatch {
|
|
|
|
t.Errorf("variants of libFoo expected:\n")
|
|
|
|
for _, v := range expectedVariants {
|
|
|
|
t.Errorf("%q\n", v)
|
|
|
|
}
|
|
|
|
t.Errorf(", but got:\n")
|
|
|
|
for _, v := range variants {
|
|
|
|
t.Errorf("%q\n", v)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
libBarLinkRule := ctx.ModuleForTests("libBar", "android_arm64_armv8-a_shared").Rule("ld")
|
Add support for versioned stubs.
A cc_library or cc_library_shared can be configured to have stubs
variants of the lib.
cc_library_shared {
name: "libfoo",
srcs: ["foo.cpp"],
stubs: {
symbol_file: "foo.map.txt",
versions: ["1", "2", "3"],
},
}
then, stubs variants of libfoo for version 1, 2, and 3 are created
from foo.map.txt. Each version has the symbols from the map file where
each symbol is annotated with the version that the symbol was introduced
via the 'introduced=<ver>' syntax. The versions don't need to be in sync
with the platform versions (e.g., P for 28). The versions are local to
the library.
For another library or executable to use the versioned stubs lib, use
the new 'name#ver' syntax to specify the version:
cc_binary {
name: "test",
....
shared_libs: ["libFoo#2"],
}
Internally, a new mutator 'version' is applied to all cc.Module objects.
By default, a variant named 'impl' is created for the non-stub version.
If the versions property is set, additional variations are created per a
version with the mutable property BuildStubs set as true, which lets the
compiler and the linker to build a stubs lib from the symbol file
instead from the source files.
This feature will be used to enforce stable interfaces among APEXs. When
a lib foo in an APEX is depending on a lib bar in another APEX, then bar
should have stable interface (in C lang) and foo should be depending on
one of the stubs libs of bar. Only libraries in the same APEX as foo can
link against non-stub version of it.
Bug: 112672359
Test: m (cc_test added)
Change-Id: I2488be0b9d7b7b8d7761234dc1c9c0e3add8601c
2018-10-15 15:25:07 +02:00
|
|
|
libFlags := libBarLinkRule.Args["libFlags"]
|
2019-11-21 01:39:12 +01:00
|
|
|
libFoo1StubPath := "libFoo/android_arm64_armv8-a_shared_1/libFoo.so"
|
Add support for versioned stubs.
A cc_library or cc_library_shared can be configured to have stubs
variants of the lib.
cc_library_shared {
name: "libfoo",
srcs: ["foo.cpp"],
stubs: {
symbol_file: "foo.map.txt",
versions: ["1", "2", "3"],
},
}
then, stubs variants of libfoo for version 1, 2, and 3 are created
from foo.map.txt. Each version has the symbols from the map file where
each symbol is annotated with the version that the symbol was introduced
via the 'introduced=<ver>' syntax. The versions don't need to be in sync
with the platform versions (e.g., P for 28). The versions are local to
the library.
For another library or executable to use the versioned stubs lib, use
the new 'name#ver' syntax to specify the version:
cc_binary {
name: "test",
....
shared_libs: ["libFoo#2"],
}
Internally, a new mutator 'version' is applied to all cc.Module objects.
By default, a variant named 'impl' is created for the non-stub version.
If the versions property is set, additional variations are created per a
version with the mutable property BuildStubs set as true, which lets the
compiler and the linker to build a stubs lib from the symbol file
instead from the source files.
This feature will be used to enforce stable interfaces among APEXs. When
a lib foo in an APEX is depending on a lib bar in another APEX, then bar
should have stable interface (in C lang) and foo should be depending on
one of the stubs libs of bar. Only libraries in the same APEX as foo can
link against non-stub version of it.
Bug: 112672359
Test: m (cc_test added)
Change-Id: I2488be0b9d7b7b8d7761234dc1c9c0e3add8601c
2018-10-15 15:25:07 +02:00
|
|
|
if !strings.Contains(libFlags, libFoo1StubPath) {
|
|
|
|
t.Errorf("%q is not found in %q", libFoo1StubPath, libFlags)
|
|
|
|
}
|
2018-11-02 10:23:15 +01:00
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
libBarCompileRule := ctx.ModuleForTests("libBar", "android_arm64_armv8-a_shared").Rule("cc")
|
2018-11-02 10:23:15 +01:00
|
|
|
cFlags := libBarCompileRule.Args["cFlags"]
|
|
|
|
libFoo1VersioningMacro := "-D__LIBFOO_API__=1"
|
|
|
|
if !strings.Contains(cFlags, libFoo1VersioningMacro) {
|
|
|
|
t.Errorf("%q is not found in %q", libFoo1VersioningMacro, cFlags)
|
|
|
|
}
|
2018-07-11 03:49:27 +02:00
|
|
|
}
|
2018-12-18 20:08:25 +01:00
|
|
|
|
2020-03-13 10:57:35 +01:00
|
|
|
func TestVersioningMacro(t *testing.T) {
|
|
|
|
for _, tc := range []struct{ moduleName, expected string }{
|
|
|
|
{"libc", "__LIBC_API__"},
|
|
|
|
{"libfoo", "__LIBFOO_API__"},
|
|
|
|
{"libfoo@1", "__LIBFOO_1_API__"},
|
|
|
|
{"libfoo-v1", "__LIBFOO_V1_API__"},
|
|
|
|
{"libfoo.v1", "__LIBFOO_V1_API__"},
|
|
|
|
} {
|
|
|
|
checkEquals(t, tc.moduleName, tc.expected, versioningMacroName(tc.moduleName))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-18 20:08:25 +01:00
|
|
|
func TestStaticExecutable(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_binary {
|
|
|
|
name: "static_test",
|
2019-08-16 21:14:32 +02:00
|
|
|
srcs: ["foo.c", "baz.o"],
|
2018-12-18 20:08:25 +01:00
|
|
|
static_executable: true,
|
|
|
|
}`)
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
variant := "android_arm64_armv8-a"
|
2018-12-18 20:08:25 +01:00
|
|
|
binModuleRule := ctx.ModuleForTests("static_test", variant).Rule("ld")
|
|
|
|
libFlags := binModuleRule.Args["libFlags"]
|
Stop linking libdl.a into static bins
libdl.a has a no-op dlopen, which breaks static libraries that need a real
dlopen. Instead of automatically linking libdl.a into static executables,
make it optional.
Until recently, the libunwind_llvm.a unwinder, used on arm32, needed the
no-op dladdr, but it's now built using -D_LIBUNWIND_USE_DLADDR=0.
The HWASan run-time uses dlsym and dladdr, so add a libdl dependency for
HWASan-built static binaries. We could also remove the dependency from
libclang_rt.hwasan_static-*.a, but this is also easy to do.
Bug: http://b/141485154
Test: bionic unit tests, device boots, verify that static and dynamic
executables can throw/catch an exception
Test: verify that a static executable using dlopen doesn't link (unless it
adds an explicit dependency on libdl)
Change-Id: Ic52c3f336b671b4ed335e99c94a64dfe8614b618
2019-10-12 00:03:34 +02:00
|
|
|
systemStaticLibs := []string{"libc.a", "libm.a"}
|
2018-12-18 20:08:25 +01:00
|
|
|
for _, lib := range systemStaticLibs {
|
|
|
|
if !strings.Contains(libFlags, lib) {
|
|
|
|
t.Errorf("Static lib %q was not found in %q", lib, libFlags)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
systemSharedLibs := []string{"libc.so", "libm.so", "libdl.so"}
|
|
|
|
for _, lib := range systemSharedLibs {
|
|
|
|
if strings.Contains(libFlags, lib) {
|
|
|
|
t.Errorf("Shared lib %q was found in %q", lib, libFlags)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-01-31 16:31:10 +01:00
|
|
|
|
|
|
|
func TestStaticDepsOrderWithStubs(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_binary {
|
|
|
|
name: "mybin",
|
|
|
|
srcs: ["foo.c"],
|
2020-09-18 23:15:30 +02:00
|
|
|
static_libs: ["libfooC", "libfooB"],
|
2019-01-31 16:31:10 +01:00
|
|
|
static_executable: true,
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
2020-02-15 20:29:50 +01:00
|
|
|
name: "libfooB",
|
2019-01-31 16:31:10 +01:00
|
|
|
srcs: ["foo.c"],
|
2020-02-15 20:29:50 +01:00
|
|
|
shared_libs: ["libfooC"],
|
2019-01-31 16:31:10 +01:00
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
2020-02-15 20:29:50 +01:00
|
|
|
name: "libfooC",
|
2019-01-31 16:31:10 +01:00
|
|
|
srcs: ["foo.c"],
|
|
|
|
stl: "none",
|
|
|
|
stubs: {
|
|
|
|
versions: ["1"],
|
|
|
|
},
|
|
|
|
}`)
|
|
|
|
|
2020-09-18 23:15:30 +02:00
|
|
|
mybin := ctx.ModuleForTests("mybin", "android_arm64_armv8-a").Rule("ld")
|
|
|
|
actual := mybin.Implicits[:2]
|
2020-02-15 20:29:50 +01:00
|
|
|
expected := getOutputPaths(ctx, "android_arm64_armv8-a_static", []string{"libfooB", "libfooC"})
|
2019-01-31 16:31:10 +01:00
|
|
|
|
|
|
|
if !reflect.DeepEqual(actual, expected) {
|
|
|
|
t.Errorf("staticDeps orderings were not propagated correctly"+
|
|
|
|
"\nactual: %v"+
|
|
|
|
"\nexpected: %v",
|
|
|
|
actual,
|
|
|
|
expected,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
2019-05-15 21:01:54 +02:00
|
|
|
|
2019-08-23 04:18:57 +02:00
|
|
|
func TestErrorsIfAModuleDependsOnDisabled(t *testing.T) {
|
|
|
|
testCcError(t, `module "libA" .* depends on disabled module "libB"`, `
|
|
|
|
cc_library {
|
|
|
|
name: "libA",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
shared_libs: ["libB"],
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libB",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
enabled: false,
|
|
|
|
stl: "none",
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
}
|
|
|
|
|
2019-07-15 18:34:09 +02:00
|
|
|
// Simple smoke test for the cc_fuzz target that ensures the rule compiles
|
|
|
|
// correctly.
|
|
|
|
func TestFuzzTarget(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_fuzz {
|
|
|
|
name: "fuzz_smoke_test",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
}`)
|
|
|
|
|
2019-12-19 20:06:13 +01:00
|
|
|
variant := "android_arm64_armv8-a_fuzzer"
|
2019-07-15 18:34:09 +02:00
|
|
|
ctx.ModuleForTests("fuzz_smoke_test", variant).Rule("cc")
|
|
|
|
}
|
|
|
|
|
2019-07-07 09:27:47 +02:00
|
|
|
func TestAidl(t *testing.T) {
|
|
|
|
}
|
|
|
|
|
2019-05-15 21:01:54 +02:00
|
|
|
func assertString(t *testing.T, got, expected string) {
|
|
|
|
t.Helper()
|
|
|
|
if got != expected {
|
|
|
|
t.Errorf("expected %q got %q", expected, got)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func assertArrayString(t *testing.T, got, expected []string) {
|
|
|
|
t.Helper()
|
|
|
|
if len(got) != len(expected) {
|
|
|
|
t.Errorf("expected %d (%q) got (%d) %q", len(expected), expected, len(got), got)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
for i := range got {
|
|
|
|
if got[i] != expected[i] {
|
|
|
|
t.Errorf("expected %d-th %q (%q) got %q (%q)",
|
|
|
|
i, expected[i], expected, got[i], got)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-09-24 23:55:04 +02:00
|
|
|
|
2019-10-30 10:43:49 +01:00
|
|
|
func assertMapKeys(t *testing.T, m map[string]string, expected []string) {
|
|
|
|
t.Helper()
|
|
|
|
assertArrayString(t, android.SortedStringKeys(m), expected)
|
|
|
|
}
|
|
|
|
|
2019-09-24 23:55:04 +02:00
|
|
|
func TestDefaults(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_defaults {
|
|
|
|
name: "defaults",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
static: {
|
|
|
|
srcs: ["bar.c"],
|
|
|
|
},
|
|
|
|
shared: {
|
|
|
|
srcs: ["baz.c"],
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_static {
|
|
|
|
name: "libstatic",
|
|
|
|
defaults: ["defaults"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libshared",
|
|
|
|
defaults: ["defaults"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libboth",
|
|
|
|
defaults: ["defaults"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_binary {
|
|
|
|
name: "binary",
|
|
|
|
defaults: ["defaults"],
|
|
|
|
}`)
|
|
|
|
|
|
|
|
pathsToBase := func(paths android.Paths) []string {
|
|
|
|
var ret []string
|
|
|
|
for _, p := range paths {
|
|
|
|
ret = append(ret, p.Base())
|
|
|
|
}
|
|
|
|
return ret
|
|
|
|
}
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
shared := ctx.ModuleForTests("libshared", "android_arm64_armv8-a_shared").Rule("ld")
|
2019-09-24 23:55:04 +02:00
|
|
|
if g, w := pathsToBase(shared.Inputs), []string{"foo.o", "baz.o"}; !reflect.DeepEqual(w, g) {
|
|
|
|
t.Errorf("libshared ld rule wanted %q, got %q", w, g)
|
|
|
|
}
|
2019-11-21 01:39:12 +01:00
|
|
|
bothShared := ctx.ModuleForTests("libboth", "android_arm64_armv8-a_shared").Rule("ld")
|
2019-09-24 23:55:04 +02:00
|
|
|
if g, w := pathsToBase(bothShared.Inputs), []string{"foo.o", "baz.o"}; !reflect.DeepEqual(w, g) {
|
|
|
|
t.Errorf("libboth ld rule wanted %q, got %q", w, g)
|
|
|
|
}
|
2019-11-21 01:39:12 +01:00
|
|
|
binary := ctx.ModuleForTests("binary", "android_arm64_armv8-a").Rule("ld")
|
2019-09-24 23:55:04 +02:00
|
|
|
if g, w := pathsToBase(binary.Inputs), []string{"foo.o"}; !reflect.DeepEqual(w, g) {
|
|
|
|
t.Errorf("binary ld rule wanted %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
2019-11-21 01:39:12 +01:00
|
|
|
static := ctx.ModuleForTests("libstatic", "android_arm64_armv8-a_static").Rule("ar")
|
2019-09-24 23:55:04 +02:00
|
|
|
if g, w := pathsToBase(static.Inputs), []string{"foo.o", "bar.o"}; !reflect.DeepEqual(w, g) {
|
|
|
|
t.Errorf("libstatic ar rule wanted %q, got %q", w, g)
|
|
|
|
}
|
2019-11-21 01:39:12 +01:00
|
|
|
bothStatic := ctx.ModuleForTests("libboth", "android_arm64_armv8-a_static").Rule("ar")
|
2019-09-24 23:55:04 +02:00
|
|
|
if g, w := pathsToBase(bothStatic.Inputs), []string{"foo.o", "bar.o"}; !reflect.DeepEqual(w, g) {
|
|
|
|
t.Errorf("libboth ar rule wanted %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
}
|
2020-02-07 02:01:55 +01:00
|
|
|
|
|
|
|
func TestProductVariableDefaults(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
cc_defaults {
|
|
|
|
name: "libfoo_defaults",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
cppflags: ["-DFOO"],
|
|
|
|
product_variables: {
|
|
|
|
debuggable: {
|
|
|
|
cppflags: ["-DBAR"],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library {
|
|
|
|
name: "libfoo",
|
|
|
|
defaults: ["libfoo_defaults"],
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.Debuggable = BoolPtr(true)
|
|
|
|
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx := CreateTestContext(config)
|
2020-02-07 02:01:55 +01:00
|
|
|
ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
|
|
|
ctx.BottomUp("variable", android.VariableMutator).Parallel()
|
|
|
|
})
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx.Register()
|
2020-02-07 02:01:55 +01:00
|
|
|
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
|
|
|
|
libfoo := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_static").Module().(*Module)
|
|
|
|
if !android.InList("-DBAR", libfoo.flags.Local.CppFlags) {
|
|
|
|
t.Errorf("expected -DBAR in cppflags, got %q", libfoo.flags.Local.CppFlags)
|
|
|
|
}
|
|
|
|
}
|
2020-09-23 03:11:25 +02:00
|
|
|
|
|
|
|
func TestEmptyWholeStaticLibsAllowMissingDependencies(t *testing.T) {
|
|
|
|
t.Parallel()
|
|
|
|
bp := `
|
|
|
|
cc_library_static {
|
|
|
|
name: "libfoo",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
whole_static_libs: ["libbar"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_static {
|
|
|
|
name: "libbar",
|
|
|
|
whole_static_libs: ["libmissing"],
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
config.TestProductVariables.Allow_missing_dependencies = BoolPtr(true)
|
|
|
|
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx := CreateTestContext(config)
|
2020-09-23 03:11:25 +02:00
|
|
|
ctx.SetAllowMissingDependencies(true)
|
2020-10-30 01:09:13 +01:00
|
|
|
ctx.Register()
|
2020-09-23 03:11:25 +02:00
|
|
|
|
|
|
|
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
_, errs = ctx.PrepareBuildActions(config)
|
|
|
|
android.FailIfErrored(t, errs)
|
|
|
|
|
|
|
|
libbar := ctx.ModuleForTests("libbar", "android_arm64_armv8-a_static").Output("libbar.a")
|
|
|
|
if g, w := libbar.Rule, android.ErrorRule; g != w {
|
|
|
|
t.Fatalf("Expected libbar rule to be %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := libbar.Args["error"], "missing dependencies: libmissing"; !strings.Contains(g, w) {
|
|
|
|
t.Errorf("Expected libbar error to contain %q, was %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
libfoo := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_static").Output("libfoo.a")
|
|
|
|
if g, w := libfoo.Inputs.Strings(), libbar.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("Expected libfoo.a to depend on %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2020-11-11 03:12:15 +01:00
|
|
|
|
|
|
|
func TestInstallSharedLibs(t *testing.T) {
|
|
|
|
bp := `
|
|
|
|
cc_binary {
|
|
|
|
name: "bin",
|
|
|
|
host_supported: true,
|
|
|
|
shared_libs: ["libshared"],
|
|
|
|
runtime_libs: ["libruntime"],
|
|
|
|
srcs: [":gen"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libshared",
|
|
|
|
host_supported: true,
|
|
|
|
shared_libs: ["libtransitive"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libtransitive",
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libruntime",
|
|
|
|
host_supported: true,
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_binary_host {
|
|
|
|
name: "tool",
|
|
|
|
srcs: ["foo.cpp"],
|
|
|
|
}
|
|
|
|
|
|
|
|
genrule {
|
|
|
|
name: "gen",
|
|
|
|
tools: ["tool"],
|
|
|
|
out: ["gen.cpp"],
|
|
|
|
cmd: "$(location tool) $(out)",
|
|
|
|
}
|
|
|
|
`
|
|
|
|
|
|
|
|
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
|
|
|
ctx := testCcWithConfig(t, config)
|
|
|
|
|
|
|
|
hostBin := ctx.ModuleForTests("bin", config.BuildOSTarget.String()).Description("install")
|
|
|
|
hostShared := ctx.ModuleForTests("libshared", config.BuildOSTarget.String()+"_shared").Description("install")
|
|
|
|
hostRuntime := ctx.ModuleForTests("libruntime", config.BuildOSTarget.String()+"_shared").Description("install")
|
|
|
|
hostTransitive := ctx.ModuleForTests("libtransitive", config.BuildOSTarget.String()+"_shared").Description("install")
|
|
|
|
hostTool := ctx.ModuleForTests("tool", config.BuildOSTarget.String()).Description("install")
|
|
|
|
|
|
|
|
if g, w := hostBin.Implicits.Strings(), hostShared.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("expected host bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := hostBin.Implicits.Strings(), hostTransitive.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("expected host bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := hostShared.Implicits.Strings(), hostTransitive.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("expected host bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := hostBin.Implicits.Strings(), hostRuntime.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("expected host bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := hostBin.Implicits.Strings(), hostTool.Output.String(); android.InList(w, g) {
|
|
|
|
t.Errorf("expected no host bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
deviceBin := ctx.ModuleForTests("bin", "android_arm64_armv8-a").Description("install")
|
|
|
|
deviceShared := ctx.ModuleForTests("libshared", "android_arm64_armv8-a_shared").Description("install")
|
|
|
|
deviceTransitive := ctx.ModuleForTests("libtransitive", "android_arm64_armv8-a_shared").Description("install")
|
|
|
|
deviceRuntime := ctx.ModuleForTests("libruntime", "android_arm64_armv8-a_shared").Description("install")
|
|
|
|
|
|
|
|
if g, w := deviceBin.OrderOnly.Strings(), deviceShared.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("expected device bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := deviceBin.OrderOnly.Strings(), deviceTransitive.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("expected device bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := deviceShared.OrderOnly.Strings(), deviceTransitive.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("expected device bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := deviceBin.OrderOnly.Strings(), deviceRuntime.Output.String(); !android.InList(w, g) {
|
|
|
|
t.Errorf("expected device bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
if g, w := deviceBin.OrderOnly.Strings(), hostTool.Output.String(); android.InList(w, g) {
|
|
|
|
t.Errorf("expected no device bin dependency %q, got %q", w, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2020-12-01 15:40:09 +01:00
|
|
|
|
|
|
|
func TestStubsLibReexportsHeaders(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libclient",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
shared_libs: ["libfoo#1"],
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libfoo",
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
shared_libs: ["libbar"],
|
|
|
|
export_shared_lib_headers: ["libbar"],
|
|
|
|
stubs: {
|
|
|
|
symbol_file: "foo.map.txt",
|
|
|
|
versions: ["1", "2", "3"],
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
cc_library_shared {
|
|
|
|
name: "libbar",
|
|
|
|
export_include_dirs: ["include/libbar"],
|
|
|
|
srcs: ["foo.c"],
|
|
|
|
}`)
|
|
|
|
|
|
|
|
cFlags := ctx.ModuleForTests("libclient", "android_arm64_armv8-a_shared").Rule("cc").Args["cFlags"]
|
|
|
|
|
|
|
|
if !strings.Contains(cFlags, "-Iinclude/libbar") {
|
|
|
|
t.Errorf("expected %q in cflags, got %q", "-Iinclude/libbar", cFlags)
|
|
|
|
}
|
|
|
|
}
|
2021-01-05 02:33:16 +01:00
|
|
|
|
|
|
|
func TestAidlFlagsPassedToTheAidlCompiler(t *testing.T) {
|
|
|
|
ctx := testCc(t, `
|
|
|
|
cc_library {
|
|
|
|
name: "libfoo",
|
|
|
|
srcs: ["a/Foo.aidl"],
|
|
|
|
aidl: { flags: ["-Werror"], },
|
|
|
|
}
|
|
|
|
`)
|
|
|
|
|
|
|
|
libfoo := ctx.ModuleForTests("libfoo", "android_arm64_armv8-a_static")
|
|
|
|
manifest := android.RuleBuilderSboxProtoForTests(t, libfoo.Output("aidl.sbox.textproto"))
|
|
|
|
aidlCommand := manifest.Commands[0].GetCommand()
|
|
|
|
expectedAidlFlag := "-Werror"
|
|
|
|
if !strings.Contains(aidlCommand, expectedAidlFlag) {
|
|
|
|
t.Errorf("aidl command %q does not contain %q", aidlCommand, expectedAidlFlag)
|
|
|
|
}
|
|
|
|
}
|