Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f64aecc authored by Inseob Kim's avatar Inseob Kim
Browse files

Fix .vendor suffix for snapshots 

.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
parent e6c44dc8

cc/vendor_snapshot.go

+17 −5
Original line number Diff line number Diff line
@@ -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,12 +787,20 @@ func VendorSnapshotSourceMutator(ctx android.BottomUpMutatorContext) { 
		return

	}



	if module.HasVendorVariant() {

	// 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()



		if !ramdisk_available && !recovery_available {

			vendorSnapshotsLock.Lock()

			defer vendorSnapshotsLock.Unlock()



			vendorSuffixModules(ctx.Config())[ctx.ModuleName()] = true

		}

	}



	if module.isSnapshotPrebuilt() || module.VndkVersion() != ctx.DeviceConfig().VndkVersion() {

		// only non-snapshot modules with BOARD_VNDK_VERSION