StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install current VNDK libs to the versioned directories. am: 8fe1212261 am: df323367e7

Browse Source 
am: 0de3759433

Change-Id: I70feaaa31fe8b66714cedeede3b6692ed283301f
This commit is contained in:
Justin Yun
2017-12-13 03:00:05 +00:00
committed by android-build-merger
parent c91381004f 0de3759433
commit b41da7cd8e
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -648,6 +648,10 @@ func (c *deviceConfig) VndkVersion() string {
return String(c.config.ProductVariables.DeviceVndkVersion)
}
func (c *deviceConfig) PlatformVndkVersion() string {
return String(c.config.ProductVariables.Platform_vndk_version)
}
func (c *deviceConfig) ExtraVndkVersions() []string {
return c.config.ProductVariables.ExtraVndkVersions
}

1
android/variable.go
View File

@@ -116,6 +116,7 @@ type productVariables struct {
Platform_sdk_final *bool `json:",omitempty"`
Platform_version_active_codenames []string `json:",omitempty"`
Platform_version_future_codenames []string `json:",omitempty"`
Platform_vndk_version *string `json:",omitempty"`
DeviceName *string `json:",omitempty"`
DeviceArch *string `json:",omitempty"`

15
cc/library.go
View File

@@ -720,13 +720,14 @@ func (library *libraryDecorator) toc() android.OptionalPath {
func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
if library.shared() {
if ctx.Device() {
if ctx.useVndk() {
if ctx.isVndkSp() {
library.baseInstaller.subDir = "vndk-sp"
} else if ctx.isVndk() {
library.baseInstaller.subDir = "vndk"
}
if ctx.Device() && ctx.useVndk() {
if ctx.isVndkSp() {
library.baseInstaller.subDir = "vndk-sp"
} else if ctx.isVndk() {
library.baseInstaller.subDir = "vndk"
}
if ctx.isVndk() && ctx.DeviceConfig().PlatformVndkVersion() != "current" {
library.baseInstaller.subDir += "-" + ctx.DeviceConfig().PlatformVndkVersion()
}
}
library.baseInstaller.install(ctx, file)