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

Merge "Remove deps from Soong intermediate to symbols" into udc-dev

Browse Source
This commit is contained in:
Jooyung Han
2023-04-27 01:01:28 +00:00
committed by Android (Google) Code Review
parent 2b6b7af8f4 0548979522
commit fef2ccb868
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apex/apex_test.go
View File

@@ -5716,6 +5716,7 @@ func TestPrebuiltSkipsSymbols(t *testing.T) {
// Source module // Source module
apex { apex {
name: "myapex", name: "myapex",
binaries: ["foo"],
key: "myapex.key", key: "myapex.key",
updatable: false, updatable: false,
} }
@@ -5731,11 +5732,19 @@ func TestPrebuiltSkipsSymbols(t *testing.T) {
set: "myapex.apks", set: "myapex.apks",
`+preferProperty+` `+preferProperty+`
} }
cc_binary {
name: "foo",
srcs: ["mylib.cpp"],
system_shared_libs: [],
stl: "none",
apex_available: [ "myapex" ],
}
`) `)
// Symbol files are installed by installing entries under ${OUT}/apex/{apex name} // Symbol files are installed by installing entries under ${OUT}/apex/{apex name}
android.AssertStringListContainsEquals(t, "Implicits", android.AssertStringListContainsEquals(t, "Installs",
ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexRule").Implicits.Strings(), ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().FilesToInstall().Strings(),
"out/soong/target/product/test_device/apex/myapex/apex_manifest.pb", filepath.Join(ctx.Config().SoongOutDir(), "target/product/test_device/apex/myapex/bin/foo"),
tc.installSymbolFiles) tc.installSymbolFiles)
}) })
} }

11
apex/builder.go
View File

@@ -517,9 +517,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
} }
} }
implicitInputs = append(implicitInputs, fi.builtFile) implicitInputs = append(implicitInputs, fi.builtFile)
if installSymbolFiles {
implicitInputs = append(implicitInputs, installedPath)
}
// Create additional symlinks pointing the file inside the APEX (if any). Note that // Create additional symlinks pointing the file inside the APEX (if any). Note that
// this is independent from the symlink optimization. // this is independent from the symlink optimization.
@@ -527,8 +524,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
symlinkDest := imageDir.Join(ctx, symlinkPath).String() symlinkDest := imageDir.Join(ctx, symlinkPath).String()
copyCommands = append(copyCommands, "ln -sfn "+filepath.Base(destPath)+" "+symlinkDest) copyCommands = append(copyCommands, "ln -sfn "+filepath.Base(destPath)+" "+symlinkDest)
if installSymbolFiles { if installSymbolFiles {
installedSymlink := ctx.InstallSymlink(apexDir.Join(ctx, filepath.Dir(symlinkPath)), filepath.Base(symlinkPath), installedPath) ctx.InstallSymlink(apexDir.Join(ctx, filepath.Dir(symlinkPath)), filepath.Base(symlinkPath), installedPath)
implicitInputs = append(implicitInputs, installedSymlink)
} }
} }
@@ -553,11 +549,6 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
installMapSet[installMapPath.String()+":"+fi.installDir+"/"+fi.builtFile.Base()] = true installMapSet[installMapPath.String()+":"+fi.installDir+"/"+fi.builtFile.Base()] = true
} }
implicitInputs = append(implicitInputs, a.manifestPbOut) implicitInputs = append(implicitInputs, a.manifestPbOut)
if installSymbolFiles {
installedManifest := ctx.InstallFile(apexDir, "apex_manifest.pb", a.manifestPbOut)
installedKey := ctx.InstallFile(apexDir, "apex_pubkey", a.publicKeyFile)
implicitInputs = append(implicitInputs, installedManifest, installedKey)
}
if len(installMapSet) > 0 { if len(installMapSet) > 0 {
var installs []string var installs []string