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

Merge changes from topic "vsdk_ramdisk"

Browse Source 
* changes:
  Add InstallInRoot property to snapshot binary json file.
  Fix for duplicate modules across vendor and ramdisk snapshots.
This commit is contained in:
Treehugger Robot
2022-03-08 17:10:54 +00:00
committed by Gerrit Code Review
parent 1e17a78c55 c1a56bcbe9
commit 86ac783d8e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/vendor_snapshot.go
View File

@@ -146,6 +146,7 @@ type snapshotJsonFlags struct {
// binary flags // binary flags
Symlinks []string `json:",omitempty"` Symlinks []string `json:",omitempty"`
StaticExecutable bool `json:",omitempty"` StaticExecutable bool `json:",omitempty"`
InstallInRoot bool `json:",omitempty"`
// dependencies // dependencies
SharedLibs []string `json:",omitempty"` SharedLibs []string `json:",omitempty"`
@@ -320,6 +321,7 @@ var ccSnapshotAction snapshot.GenerateSnapshotAction = func(s snapshot.SnapshotS
// binary flags // binary flags
prop.Symlinks = m.Symlinks() prop.Symlinks = m.Symlinks()
prop.StaticExecutable = m.StaticExecutable() prop.StaticExecutable = m.StaticExecutable()
prop.InstallInRoot = m.InstallInRoot()
prop.SharedLibs = m.SnapshotSharedLibs() prop.SharedLibs = m.SnapshotSharedLibs()
// static libs dependencies are required to collect the NOTICE files. // static libs dependencies are required to collect the NOTICE files.
prop.StaticLibs = m.SnapshotStaticLibs() prop.StaticLibs = m.SnapshotStaticLibs()

4
rust/image.go
View File

@@ -149,6 +149,10 @@ func (mod *Module) InRecovery() bool {
return mod.ModuleBase.InRecovery() || mod.ModuleBase.InstallInRecovery() return mod.ModuleBase.InRecovery() || mod.ModuleBase.InstallInRecovery()
} }
func (mod *Module) InRamdisk() bool {
return mod.ModuleBase.InRamdisk() || mod.ModuleBase.InstallInRamdisk()
}
func (mod *Module) InVendorRamdisk() bool { func (mod *Module) InVendorRamdisk() bool {
return mod.ModuleBase.InVendorRamdisk() || mod.ModuleBase.InstallInVendorRamdisk() return mod.ModuleBase.InVendorRamdisk() || mod.ModuleBase.InstallInVendorRamdisk()
} }