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

Commit 86ac783d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "vsdk_ramdisk" 

* changes:
  Add InstallInRoot property to snapshot binary json file.
  Fix for duplicate modules across vendor and ramdisk snapshots.
parents 1e17a78c c1a56bcb

cc/vendor_snapshot.go

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ type snapshotJsonFlags struct { 
	// binary flags

	Symlinks         []string `json:",omitempty"`

	StaticExecutable bool     `json:",omitempty"`

	InstallInRoot    bool     `json:",omitempty"`



	// dependencies

	SharedLibs  []string `json:",omitempty"`
@@ -320,6 +321,7 @@ var ccSnapshotAction snapshot.GenerateSnapshotAction = func(s snapshot.SnapshotS 
			// binary flags

			prop.Symlinks = m.Symlinks()

			prop.StaticExecutable = m.StaticExecutable()

			prop.InstallInRoot = m.InstallInRoot()

			prop.SharedLibs = m.SnapshotSharedLibs()

			// static libs dependencies are required to collect the NOTICE files.

			prop.StaticLibs = m.SnapshotStaticLibs()

rust/image.go

+4 −0
Original line number Diff line number Diff line
@@ -149,6 +149,10 @@ func (mod *Module) InRecovery() bool { 
	return mod.ModuleBase.InRecovery() || mod.ModuleBase.InstallInRecovery()

}



func (mod *Module) InRamdisk() bool {

	return mod.ModuleBase.InRamdisk() || mod.ModuleBase.InstallInRamdisk()

}



func (mod *Module) InVendorRamdisk() bool {

	return mod.ModuleBase.InVendorRamdisk() || mod.ModuleBase.InstallInVendorRamdisk()

}