tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix .vendor suffix for snapshots" am: 578b7ac691 am: 0a431d17b6

Browse source 
Change-Id: Id7e7a0caf72369dddb9a17490781db6829b3b545
This commit is contained in:
Automerger Merge Worker 2020-02-20 00:40:49 +00:00
commit 5fc19eecee
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cc/vendor_snapshot.go
View file

@ -41,7 +41,7 @@ var (
vendorSnapshotBinariesKey = android.NewOnceKey("vendorSnapshotBinaries")
)
// vendor snapshot maps hold names of vendor snapshot modules per arch.
// vendor snapshot maps hold names of vendor snapshot modules per arch
func vendorSuffixModules(config android.Config) map[string]bool {
return config.Once(vendorSuffixModulesKey, func() interface{} {
return make(map[string]bool)
@ -772,6 +772,10 @@ func VendorSnapshotMutator(ctx android.BottomUpMutatorContext) {
// Disables source modules which have snapshots
func VendorSnapshotSourceMutator(ctx android.BottomUpMutatorContext) {
if !ctx.Device() {
return
}
vndkVersion := ctx.DeviceConfig().VndkVersion()
// don't need snapshot if current
if vndkVersion == "current" || vndkVersion == "" {
@ -783,11 +787,19 @@ func VendorSnapshotSourceMutator(ctx android.BottomUpMutatorContext) {
return
}
if module.HasVendorVariant() {
vendorSnapshotsLock.Lock()
defer vendorSnapshotsLock.Unlock()
// vendor suffix should be added to snapshots if the source module isn't vendor: true.
if !module.SocSpecific() {
// But we can't just check SocSpecific() since we already passed the image mutator.
// Check ramdisk and recovery to see if we are real "vendor: true" module.
ramdisk_available := module.InRamdisk() && !module.OnlyInRamdisk()
recovery_available := module.InRecovery() && !module.OnlyInRecovery()
vendorSuffixModules(ctx.Config())[ctx.ModuleName()] = true
if !ramdisk_available && !recovery_available {
vendorSnapshotsLock.Lock()
defer vendorSnapshotsLock.Unlock()
vendorSuffixModules(ctx.Config())[ctx.ModuleName()] = true
}
}
if module.isSnapshotPrebuilt() || module.VndkVersion() != ctx.DeviceConfig().VndkVersion() {