Merge "Install appSet using InstallFileWithExtraFilesZip"

apex/builder.go

@@ -921,6 +921,11 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) {
 				pathOnDevice := filepath.Join("/system", fi.path())
 				installedSymlinks = append(installedSymlinks,
 					ctx.InstallAbsoluteSymlink(installDir, fi.stem(), pathOnDevice))
+			} else {
+				if fi.class == appSet {
+					as := fi.module.(*java.AndroidAppSet)
+					ctx.InstallFileWithExtraFilesZip(installDir, as.BaseModuleName()+".apk",
+						as.OutputFile(), as.PackedAdditionalOutputs())
 				} else {
 					target := ctx.InstallFile(installDir, fi.stem(), fi.builtFile)
 					for _, sym := range fi.symlinks {
@@ -929,6 +934,7 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) {
 					}
 				}
 			}
+		}
 
 		// Create install rules for the files added in GenerateAndroidBuildActions after
 		// buildFlattenedApex is called.  Add the links to system libs (if any) as dependencies