diff options
| author | Logan Chien <loganchien@google.com> | 2018-03-21 11:53:48 +0800 |
|---|---|---|
| committer | Jayant Chowdhary <jchowdhary@google.com> | 2018-03-23 16:31:04 -0700 |
| commit | b7515421d10cddd56cfb64c4428dfabe0ffa8c85 (patch) | |
| tree | 6d654fb48f049ae5347fd5c7b217df889f1efc53 /cc | |
| parent | b785b616218f11a6863ae9917076f8464aa7125e (diff) | |
| download | build_soong-b7515421d10cddd56cfb64c4428dfabe0ffa8c85.tar.gz build_soong-b7515421d10cddd56cfb64c4428dfabe0ffa8c85.tar.bz2 build_soong-b7515421d10cddd56cfb64c4428dfabe0ffa8c85.zip | |
Use PlatformVndkVersion to find ABI dump by default
This commit changes "current" to ctx.DeviceConfig.PlatformVndkVersion().
This change make it possible to place ABI dumps in
prebuilts/abi-dumps/vndk/${version} instead of
prebuilts/abi-dumps/vndk/current.
If BOARD_VNDK_VERSION is not specified or is equal to "current",
PLATFORM_VNDK_VERSION (either PLATFORM_SDK_VERSION or
PLATFORM_VERSION_CODENAME) will be chosen. Currently,
BOARD_VNDK_VERSION is always equal to "current" because both system and
vendor images are built in a single source tree.
In the future, if the system image and vendor images are separately
built in different source trees, BOARD_VNDK_VERSION will be set to other
values and we should respect that value.
Test: Create an ABI dump under
prebuilts/abi-dumps/vndk/${PLATFORM_VNDK_VERSION}, make some ABI
breakages, and see whether the checks are working.
Bug: 76036094
Merged-In: I6242e0c71ebd9acd5c4a3497c67539cb3e6663f3
Change-Id: I6242e0c71ebd9acd5c4a3497c67539cb3e6663f3
(cherry picked from commit a8f5158594fe4e72bc2c97d354621c1156666827)
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/library.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/library.go b/cc/library.go index 6fe9ca4e..bac566f7 100644 --- a/cc/library.go +++ b/cc/library.go @@ -642,8 +642,8 @@ func (library *libraryDecorator) linkShared(ctx ModuleContext, func (library *libraryDecorator) linkSAbiDumpFiles(ctx ModuleContext, objs Objects, fileName string, soFile android.Path) { //Also take into account object re-use. if len(objs.sAbiDumpFiles) > 0 && ctx.createVndkSourceAbiDump() { - vndkVersion := "current" - if ver := ctx.DeviceConfig().VndkVersion(); ver != "" { + vndkVersion := ctx.DeviceConfig().PlatformVndkVersion() + if ver := ctx.DeviceConfig().VndkVersion(); ver != "" && ver != "current" { vndkVersion = ver } |