Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50ed1f9c authored by Colin Cross's avatar Colin Cross
Browse files

Install android_app_set modules in Soong 

Add support for installing extra files from a zip file when installing
a primary file, and use it to support installing android_app_set modules,
which install a primary APK and then an unknown set of additional splits
APKs.

Test: app_set_test.go
Test: install test android_app_set
Bug: 204136549
Change-Id: Ia92f7e5c427adcef3bcf59c82a2f83450905c01d
parent ffbcd1d8

android/defs.go

+4 −4
Original line number Diff line number Diff line
@@ -52,10 +52,10 @@ var ( 
	// A copy rule.

	Cp = pctx.AndroidStaticRule("Cp",

		blueprint.RuleParams{

			Command:     "rm -f $out && cp $cpPreserveSymlinks $cpFlags $in $out",

			Command:     "rm -f $out && cp $cpPreserveSymlinks $cpFlags $in $out$extraCmds",

			Description: "cp $out",

		},

		"cpFlags")

		"cpFlags", "extraCmds")



	// A copy rule that only updates the output if it changed.

	CpIfChanged = pctx.AndroidStaticRule("CpIfChanged",
@@ -68,10 +68,10 @@ var ( 


	CpExecutable = pctx.AndroidStaticRule("CpExecutable",

		blueprint.RuleParams{

			Command:     "rm -f $out && cp $cpPreserveSymlinks $cpFlags $in $out && chmod +x $out",

			Command:     "rm -f $out && cp $cpPreserveSymlinks $cpFlags $in $out && chmod +x $out$extraCmds",

			Description: "cp $out",

		},

		"cpFlags")

		"cpFlags", "extraCmds")



	// A timestamp touch rule.

	Touch = pctx.AndroidStaticRule("Touch",

android/makevars.go

+10 −4
Original line number Diff line number Diff line
@@ -456,6 +456,9 @@ func (s *makeVarsSingleton) writeInstalls(installs, symlinks []katiInstall) []by 
		for _, dep := range install.implicitDeps {

			fmt.Fprintf(buf, " %s", dep.String())

		}

		if extraFiles := install.extraFiles; extraFiles != nil {

			fmt.Fprintf(buf, " %s", extraFiles.zip.String())

		}

		if len(install.orderOnlyDeps) > 0 {

			fmt.Fprintf(buf, " |")

		}
@@ -463,12 +466,14 @@ func (s *makeVarsSingleton) writeInstalls(installs, symlinks []katiInstall) []by 
			fmt.Fprintf(buf, " %s", dep.String())

		}

		fmt.Fprintln(buf)



		fmt.Fprintf(buf, "\trm -f $@ && cp -f %s $< $@", preserveSymlinksFlag)

		fmt.Fprintln(buf, "\t@echo \"Install $@\"")

		fmt.Fprintf(buf, "\trm -f $@ && cp -f %s $< $@\n", preserveSymlinksFlag)

		if install.executable {

			fmt.Fprintf(buf, " && chmod +x $@")

			fmt.Fprintf(buf, "\tchmod +x $@\n")

		}

		if extraFiles := install.extraFiles; extraFiles != nil {

			fmt.Fprintf(buf, "\tunzip -qDD -d '%s' '%s'\n", extraFiles.dir.String(), extraFiles.zip.String())

		}

		fmt.Fprintln(buf)

		fmt.Fprintln(buf)

	}
@@ -504,6 +509,7 @@ func (s *makeVarsSingleton) writeInstalls(installs, symlinks []katiInstall) []by 
			fromStr = symlink.absFrom

		}



		fmt.Fprintln(buf, "\t@echo \"Symlink $@\"")

		fmt.Fprintf(buf, "\trm -f $@ && ln -sfn %s $@", fromStr)

		fmt.Fprintln(buf)

		fmt.Fprintln(buf)

android/module.go

+39 −3
Original line number Diff line number Diff line
@@ -381,6 +381,16 @@ type ModuleContext interface { 
	// for which IsInstallDepNeeded returns true.

	InstallFile(installPath InstallPath, name string, srcPath Path, deps ...Path) InstallPath



	// InstallFileWithExtraFilesZip creates a rule to copy srcPath to name in the installPath

	// directory, and also unzip a zip file containing extra files to install into the same

	// directory.

	//

	// The installed file will be returned by FilesToInstall(), and the PackagingSpec for the

	// installed file will be returned by PackagingSpecs() on this module or by

	// TransitivePackagingSpecs() on modules that depend on this module through dependency tags

	// for which IsInstallDepNeeded returns true.

	InstallFileWithExtraFilesZip(installPath InstallPath, name string, srcPath Path, extraZip Path, deps ...Path) InstallPath



	// InstallSymlink creates a rule to create a symlink from src srcPath to name in the installPath

	// directory.

	//
@@ -2235,10 +2245,16 @@ type katiInstall struct { 
	implicitDeps  Paths

	orderOnlyDeps Paths

	executable    bool

	extraFiles    *extraFilesZip



	absFrom string

}



type extraFilesZip struct {

	zip Path

	dir InstallPath

}



type katiInstalls []katiInstall



// BuiltInstalled returns the katiInstalls in the form used by $(call copy-many-files) in Make, a
@@ -2852,12 +2868,20 @@ func (m *moduleContext) skipInstall() bool { 


func (m *moduleContext) InstallFile(installPath InstallPath, name string, srcPath Path,

	deps ...Path) InstallPath {

	return m.installFile(installPath, name, srcPath, deps, false)

	return m.installFile(installPath, name, srcPath, deps, false, nil)

}



func (m *moduleContext) InstallExecutable(installPath InstallPath, name string, srcPath Path,

	deps ...Path) InstallPath {

	return m.installFile(installPath, name, srcPath, deps, true)

	return m.installFile(installPath, name, srcPath, deps, true, nil)

}



func (m *moduleContext) InstallFileWithExtraFilesZip(installPath InstallPath, name string, srcPath Path,

	extraZip Path, deps ...Path) InstallPath {

	return m.installFile(installPath, name, srcPath, deps, false, &extraFilesZip{

		zip: extraZip,

		dir: installPath,

	})

}



func (m *moduleContext) PackageFile(installPath InstallPath, name string, srcPath Path) PackagingSpec {
@@ -2878,7 +2902,8 @@ func (m *moduleContext) packageFile(fullInstallPath InstallPath, srcPath Path, e 
	return spec

}



func (m *moduleContext) installFile(installPath InstallPath, name string, srcPath Path, deps []Path, executable bool) InstallPath {

func (m *moduleContext) installFile(installPath InstallPath, name string, srcPath Path, deps []Path,

	executable bool, extraZip *extraFilesZip) InstallPath {



	fullInstallPath := installPath.Join(m, name)

	m.module.base().hooks.runInstallHooks(m, srcPath, fullInstallPath, false)
@@ -2906,6 +2931,7 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat 
				implicitDeps:  implicitDeps,

				orderOnlyDeps: orderOnlyDeps,

				executable:    executable,

				extraFiles:    extraZip,

			})

		} else {

			rule := Cp
@@ -2913,6 +2939,13 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat 
				rule = CpExecutable

			}



			extraCmds := ""

			if extraZip != nil {

				extraCmds += fmt.Sprintf(" && unzip -qDD -d '%s' '%s'",

					extraZip.dir.String(), extraZip.zip.String())

				implicitDeps = append(implicitDeps, extraZip.zip)

			}



			m.Build(pctx, BuildParams{

				Rule:        rule,

				Description: "install " + fullInstallPath.Base(),
@@ -2921,6 +2954,9 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat 
				Implicits:   implicitDeps,

				OrderOnly:   orderOnlyDeps,

				Default:     !m.Config().KatiEnabled(),

				Args: map[string]string{

					"extraCmds": extraCmds,

				},

			})

		}

java/app_set.go

+10 −0
Original line number Diff line number Diff line
@@ -143,8 +143,18 @@ func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) 
				"zip":               as.packedOutput.String(),

			},

		})



	var installDir android.InstallPath

	if as.Privileged() {

		installDir = android.PathForModuleInstall(ctx, "priv-app", as.BaseModuleName())

	} else {

		installDir = android.PathForModuleInstall(ctx, "app", as.BaseModuleName())

	}

	ctx.InstallFileWithExtraFilesZip(installDir, as.BaseModuleName()+".apk", as.primaryOutput, as.packedOutput)

}



func (as *AndroidAppSet) InstallBypassMake() bool { return true }



// android_app_set extracts a set of APKs based on the target device

// configuration and installs this set as "split APKs".

// The extracted set always contains an APK whose name is