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

Merge "Fix snapshot symlinks"

Browse source
This commit is contained in:
Treehugger Robot 2022-02-25 00:41:35 +00:00 committed by Gerrit Code Review
commit 97491ead9e
4 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/androidmk.go
View file

@ -560,10 +560,6 @@ func (c *snapshotLibraryDecorator) AndroidMkEntries(ctx AndroidMkContext, entrie
func (c *snapshotBinaryDecorator) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) { func (c *snapshotBinaryDecorator) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) {
entries.Class = "EXECUTABLES" entries.Class = "EXECUTABLES"
entries.SubName = c.baseProperties.Androidmk_suffix entries.SubName = c.baseProperties.Androidmk_suffix
entries.ExtraEntries = append(entries.ExtraEntries, func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
entries.AddStrings("LOCAL_MODULE_SYMLINKS", c.Properties.Symlinks...)
})
} }
func (c *snapshotObjectLinker) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) { func (c *snapshotObjectLinker) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) {

16
cc/binary.go
View file

@ -441,6 +441,16 @@ func (binary *binaryDecorator) link(ctx ModuleContext,
// Need to determine symlinks early since some targets (ie APEX) need this // Need to determine symlinks early since some targets (ie APEX) need this
// information but will not call 'install' // information but will not call 'install'
binary.setSymlinkList(ctx)
return ret
}
func (binary *binaryDecorator) unstrippedOutputFilePath() android.Path {
return binary.unstrippedOutputFile
}
func (binary *binaryDecorator) setSymlinkList(ctx ModuleContext) {
for _, symlink := range binary.Properties.Symlinks { for _, symlink := range binary.Properties.Symlinks {
binary.symlinks = append(binary.symlinks, binary.symlinks = append(binary.symlinks,
symlink+String(binary.Properties.Suffix)+ctx.toolchain().ExecutableSuffix()) symlink+String(binary.Properties.Suffix)+ctx.toolchain().ExecutableSuffix())
@ -457,12 +467,6 @@ func (binary *binaryDecorator) link(ctx ModuleContext,
binary.preferredArchSymlink = symlinkName binary.preferredArchSymlink = symlinkName
} }
} }
return ret
}
func (binary *binaryDecorator) unstrippedOutputFilePath() android.Path {
return binary.unstrippedOutputFile
} }
func (binary *binaryDecorator) symlinkList() []string { func (binary *binaryDecorator) symlinkList() []string {

3
cc/snapshot_prebuilt.go
View file

@ -680,6 +680,9 @@ func (p *snapshotBinaryDecorator) link(ctx ModuleContext, flags Flags, deps Path
Input: in, Input: in,
}) })
// binary snapshots need symlinking
p.setSymlinkList(ctx)
return outputFile return outputFile
} }

17
cc/vendor_snapshot_test.go
View file

@ -741,6 +741,7 @@ func TestVendorSnapshotUse(t *testing.T) {
src: "bin", src: "bin",
}, },
}, },
symlinks: ["binfoo", "binbar"],
} }
vendor_snapshot_binary { vendor_snapshot_binary {
@ -920,7 +921,21 @@ func TestVendorSnapshotUse(t *testing.T) {
ctx.ModuleForTests("libvendor_without_snapshot", sharedVariant).Output("libvendor_without_snapshot.so") ctx.ModuleForTests("libvendor_without_snapshot", sharedVariant).Output("libvendor_without_snapshot.so")
// bin is installed by bin.vendor_binary.31.arm64 // bin is installed by bin.vendor_binary.31.arm64
ctx.ModuleForTests("bin.vendor_binary.31.arm64", binaryVariant).Output("bin") bin64Module := ctx.ModuleForTests("bin.vendor_binary.31.arm64", binaryVariant)
bin64Module.Output("bin")
// also test symlinks
bin64MkEntries := android.AndroidMkEntriesForTest(t, ctx, bin64Module.Module())
bin64KatiSymlinks := bin64MkEntries[0].EntryMap["LOCAL_SOONG_INSTALL_SYMLINKS"]
// Either AndroidMk entries contain symlinks, or symlinks should be installed by Soong
for _, symlink := range []string{"binfoo", "binbar"} {
if inList(symlink, bin64KatiSymlinks) {
continue
}
bin64Module.Output(symlink)
}
// bin32 is installed by bin32.vendor_binary.31.arm64 // bin32 is installed by bin32.vendor_binary.31.arm64
ctx.ModuleForTests("bin32.vendor_binary.31.arm64", binary32Variant).Output("bin32") ctx.ModuleForTests("bin32.vendor_binary.31.arm64", binary32Variant).Output("bin32")