Merge changes from topic "vendor_ramdisk_soong"

* changes:
  Vendor ramdisk modules install to correct location
  Add vendor-ramdisk image to Soong.
This commit is contained in:
Yifan Hong
2020-10-24 01:08:16 +00:00
committed by Gerrit Code Review
21 changed files with 200 additions and 48 deletions

View File

@@ -24,12 +24,13 @@ import (
)
var (
nativeBridgeSuffix = ".native_bridge"
productSuffix = ".product"
vendorSuffix = ".vendor"
ramdiskSuffix = ".ramdisk"
recoverySuffix = ".recovery"
sdkSuffix = ".sdk"
nativeBridgeSuffix = ".native_bridge"
productSuffix = ".product"
vendorSuffix = ".vendor"
ramdiskSuffix = ".ramdisk"
vendorRamdiskSuffix = ".vendor_ramdisk"
recoverySuffix = ".recovery"
sdkSuffix = ".sdk"
)
type AndroidMkContext interface {
@@ -43,6 +44,7 @@ type AndroidMkContext interface {
VndkVersion() string
static() bool
InRamdisk() bool
InVendorRamdisk() bool
InRecovery() bool
AnyVariantDirectlyInAnyApex() bool
}
@@ -280,7 +282,7 @@ func (library *libraryDecorator) AndroidMkEntries(ctx AndroidMkContext, entries
})
}
if len(library.Properties.Stubs.Versions) > 0 && !ctx.Host() && ctx.AnyVariantDirectlyInAnyApex() &&
!ctx.InRamdisk() && !ctx.InRecovery() && !ctx.UseVndk() && !ctx.static() {
!ctx.InRamdisk() && !ctx.InVendorRamdisk() && !ctx.InRecovery() && !ctx.UseVndk() && !ctx.static() {
if library.buildStubs() && library.isLatestStubVersion() {
// reference the latest version via its name without suffix when it is provided by apex
entries.SubName = ""