diff options
| -rw-r--r-- | apex/apex_test.go | 5 | ||||
| -rw-r--r-- | apex/builder.go | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 18052912a..a69faeb58 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -7241,6 +7241,11 @@ func TestAppSetBundle(t *testing.T) { 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[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) { diff --git a/apex/builder.go b/apex/builder.go index b95b3bdfd..cb09e35ac 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -1087,7 +1087,7 @@ func (a *apexBundle) buildCannedFsConfig(ctx android.ModuleContext) android.Outp } } else if f.class == appSet { appSetDirs = append(appSetDirs, f.installDir) - appSetFiles[f.installDir] = f.builtFile + appSetFiles[f.installDir] = f.module.(*java.AndroidAppSet).PackedAdditionalOutputs() } else { readOnlyPaths = append(readOnlyPaths, pathInApex) } |