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

Merge "Don't install static snapshot to device" am: bbd42fa946 am: 0e280f68fd am: bbdecd852f am: a419d38f10

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1956009

Change-Id: I5e3fbf528b2f072c918b23101ca2b1e53ec1bd42
This commit is contained in:
Treehugger Robot
2022-01-22 05:34:11 +00:00
committed by Automerger Merge Worker
parent a9a3f45ecc a419d38f10
commit 31751ab5f6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/androidmk.go
View File

@@ -15,6 +15,8 @@
package cc
import (
"github.com/google/blueprint/proptools"
"fmt"
"io"
"path/filepath"
@@ -532,7 +534,13 @@ func (c *snapshotLibraryDecorator) AndroidMkEntries(ctx AndroidMkContext, entrie
c.libraryDecorator.androidMkWriteExportedFlags(entries)
if c.shared() || c.static() {
path, file := filepath.Split(c.path.String())
src := c.path.String()
// For static libraries which aren't installed, directly use Src to extract filename.
// This is safe: generated snapshot modules have a real path as Src, not a module
if c.static() {
src = proptools.String(c.properties.Src)
}
path, file := filepath.Split(src)
stem, suffix, ext := android.SplitFileExt(file)
entries.SetString("LOCAL_BUILT_MODULE_STEM", "$(LOCAL_MODULE)"+ext)
entries.SetString("LOCAL_MODULE_SUFFIX", suffix)

2
cc/snapshot_prebuilt.go
View File

@@ -506,7 +506,7 @@ func (p *snapshotLibraryDecorator) link(ctx ModuleContext, flags Flags, deps Pat
}
func (p *snapshotLibraryDecorator) install(ctx ModuleContext, file android.Path) {
if p.MatchesWithDevice(ctx.DeviceConfig()) && (p.shared() || p.static()) {
if p.MatchesWithDevice(ctx.DeviceConfig()) && p.shared() {
p.baseInstaller.install(ctx, file)
}
}