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

Fix .vendor suffix for snapshots

Browse Source 
.vendor suffix is meant to be attached for vendor variants of
modules without "vendor: true". So when we decide whether the suffix is
needed for a snapshot module, we should check if corresponding source
module is "vendor: true" or not, instead of checking vendor_available of
the source module.

Bug: 149252327
Test: manual
Change-Id: Ibde75737ddce8e1dc974453e88832f9272a2c66e
This commit is contained in:
Inseob Kim
2020-02-18 17:27:19 +09:00
parent e6c44dc8be
commit 5f64aeccdf
1 changed files with 17 additions and 5 deletions
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") 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 { func vendorSuffixModules(config android.Config) map[string]bool {
return config.Once(vendorSuffixModulesKey, func() interface{} { return config.Once(vendorSuffixModulesKey, func() interface{} {
return make(map[string]bool) return make(map[string]bool)
@@ -772,6 +772,10 @@ func VendorSnapshotMutator(ctx android.BottomUpMutatorContext) {
// Disables source modules which have snapshots // Disables source modules which have snapshots
func VendorSnapshotSourceMutator(ctx android.BottomUpMutatorContext) { func VendorSnapshotSourceMutator(ctx android.BottomUpMutatorContext) {
if !ctx.Device() {
return
}
vndkVersion := ctx.DeviceConfig().VndkVersion() vndkVersion := ctx.DeviceConfig().VndkVersion()
// don't need snapshot if current // don't need snapshot if current
if vndkVersion == "current" || vndkVersion == "" { if vndkVersion == "current" || vndkVersion == "" {
@@ -783,11 +787,19 @@ func VendorSnapshotSourceMutator(ctx android.BottomUpMutatorContext) {
return return
} }
if module.HasVendorVariant() { // vendor suffix should be added to snapshots if the source module isn't vendor: true.
vendorSnapshotsLock.Lock() if !module.SocSpecific() {
defer vendorSnapshotsLock.Unlock() // 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() { if module.isSnapshotPrebuilt() || module.VndkVersion() != ctx.DeviceConfig().VndkVersion() {