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

Merge "Use PackedAdditionalOutputs when reading apk_set for canned_fs_config"

Browse Source
This commit is contained in:
Jiyong Park
2022-09-27 00:11:05 +00:00
committed by Gerrit Code Review
parent 60644f9cb0 e1b6914f58
commit afc97f0209
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/apex_test.go
View File

@@ -7241,6 +7241,11 @@ func TestAppSetBundle(t *testing.T) {
ensureMatches(t, copyCmds[0], "^rm -rf .*/app/AppSet@TEST.BUILD_ID$") ensureMatches(t, copyCmds[0], "^rm -rf .*/app/AppSet@TEST.BUILD_ID$")
ensureMatches(t, copyCmds[1], "^mkdir -p .*/app/AppSet@TEST.BUILD_ID$") ensureMatches(t, copyCmds[1], "^mkdir -p .*/app/AppSet@TEST.BUILD_ID$")
ensureMatches(t, copyCmds[2], "^unzip .*-d .*/app/AppSet@TEST.BUILD_ID .*/AppSet.zip$") ensureMatches(t, copyCmds[2], "^unzip .*-d .*/app/AppSet@TEST.BUILD_ID .*/AppSet.zip$")
// Ensure that canned_fs_config has an entry for the app set zip file
generateFsRule := mod.Rule("generateFsConfig")
cmd := generateFsRule.RuleParams.Command
ensureContains(t, cmd, "AppSet.zip")
} }
func TestAppSetBundlePrebuilt(t *testing.T) { func TestAppSetBundlePrebuilt(t *testing.T) {

2
apex/builder.go
View File

@@ -1087,7 +1087,7 @@ func (a *apexBundle) buildCannedFsConfig(ctx android.ModuleContext) android.Outp
} }
} else if f.class == appSet { } else if f.class == appSet {
appSetDirs = append(appSetDirs, f.installDir) appSetDirs = append(appSetDirs, f.installDir)
appSetFiles[f.installDir] = f.builtFile appSetFiles[f.installDir] = f.module.(*java.AndroidAppSet).PackedAdditionalOutputs()
} else { } else {
readOnlyPaths = append(readOnlyPaths, pathInApex) readOnlyPaths = append(readOnlyPaths, pathInApex)
} }