Implement android_app_set module
Bug: 152319766 Test: manual and builtin Change-Id: Id0877476f9ae23311d92c0b59a9c568140ab4119
This commit is contained in:
122
java/app.go
122
java/app.go
@@ -20,6 +20,7 @@ import (
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/google/blueprint"
|
||||
@@ -49,6 +50,127 @@ func RegisterAppBuildComponents(ctx android.RegistrationContext) {
|
||||
ctx.RegisterModuleType("android_app_import", AndroidAppImportFactory)
|
||||
ctx.RegisterModuleType("android_test_import", AndroidTestImportFactory)
|
||||
ctx.RegisterModuleType("runtime_resource_overlay", RuntimeResourceOverlayFactory)
|
||||
ctx.RegisterModuleType("android_app_set", AndroidApkSetFactory)
|
||||
}
|
||||
|
||||
type AndroidAppSetProperties struct {
|
||||
// APK Set path
|
||||
Set *string
|
||||
|
||||
// Specifies that this app should be installed to the priv-app directory,
|
||||
// where the system will grant it additional privileges not available to
|
||||
// normal apps.
|
||||
Privileged *bool
|
||||
|
||||
// APKs in this set use prerelease SDK version
|
||||
Prerelease *bool
|
||||
|
||||
// Names of modules to be overridden. Listed modules can only be other apps
|
||||
// (in Make or Soong).
|
||||
Overrides []string
|
||||
}
|
||||
|
||||
type AndroidAppSet struct {
|
||||
android.ModuleBase
|
||||
android.DefaultableModuleBase
|
||||
prebuilt android.Prebuilt
|
||||
|
||||
properties AndroidAppSetProperties
|
||||
packedOutput android.WritablePath
|
||||
masterFile string
|
||||
}
|
||||
|
||||
func (as *AndroidAppSet) Name() string {
|
||||
return as.prebuilt.Name(as.ModuleBase.Name())
|
||||
}
|
||||
|
||||
func (as *AndroidAppSet) IsInstallable() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (as *AndroidAppSet) Prebuilt() *android.Prebuilt {
|
||||
return &as.prebuilt
|
||||
}
|
||||
|
||||
func (as *AndroidAppSet) Privileged() bool {
|
||||
return Bool(as.properties.Privileged)
|
||||
}
|
||||
|
||||
var targetCpuAbi = map[string]string{
|
||||
"arm": "ARMEABI_V7A",
|
||||
"arm64": "ARM64_V8A",
|
||||
"x86": "X86",
|
||||
"x86_64": "X86_64",
|
||||
}
|
||||
|
||||
func supportedAbis(ctx android.ModuleContext) []string {
|
||||
abiName := func(archVar string, deviceArch string) string {
|
||||
if abi, found := targetCpuAbi[deviceArch]; found {
|
||||
return abi
|
||||
}
|
||||
ctx.ModuleErrorf("Invalid %s: %s", archVar, deviceArch)
|
||||
return "BAD_ABI"
|
||||
}
|
||||
|
||||
result := []string{abiName("TARGET_ARCH", ctx.DeviceConfig().DeviceArch())}
|
||||
if s := ctx.DeviceConfig().DeviceSecondaryArch(); s != "" {
|
||||
result = append(result, abiName("TARGET_2ND_ARCH", s))
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (as *AndroidAppSet) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
as.packedOutput = android.PathForModuleOut(ctx, "extracted.zip")
|
||||
// We are assuming here that the master file in the APK
|
||||
// set has `.apk` suffix. If it doesn't the build will fail.
|
||||
// APK sets containing APEX files are handled elsewhere.
|
||||
as.masterFile = ctx.ModuleName() + ".apk"
|
||||
screenDensities := "all"
|
||||
if dpis := ctx.Config().ProductAAPTPrebuiltDPI(); len(dpis) > 0 {
|
||||
screenDensities = strings.ToUpper(strings.Join(dpis, ","))
|
||||
}
|
||||
// TODO(asmundak): handle locales.
|
||||
// TODO(asmundak): do we support device features
|
||||
ctx.Build(pctx,
|
||||
android.BuildParams{
|
||||
Rule: extractMatchingApks,
|
||||
Description: "Extract APKs from APK set",
|
||||
Output: as.packedOutput,
|
||||
Inputs: android.Paths{as.prebuilt.SingleSourcePath(ctx)},
|
||||
Args: map[string]string{
|
||||
"abis": strings.Join(supportedAbis(ctx), ","),
|
||||
"allow-prereleased": strconv.FormatBool(proptools.Bool(as.properties.Prerelease)),
|
||||
"screen-densities": screenDensities,
|
||||
"sdk-version": ctx.Config().PlatformSdkVersion(),
|
||||
"stem": ctx.ModuleName(),
|
||||
},
|
||||
})
|
||||
// TODO(asmundak): add this (it's wrong now, will cause copying extracted.zip)
|
||||
/*
|
||||
var installDir android.InstallPath
|
||||
if Bool(as.properties.Privileged) {
|
||||
installDir = android.PathForModuleInstall(ctx, "priv-app", as.BaseModuleName())
|
||||
} else if ctx.InstallInTestcases() {
|
||||
installDir = android.PathForModuleInstall(ctx, as.BaseModuleName(), ctx.DeviceConfig().DeviceArch())
|
||||
} else {
|
||||
installDir = android.PathForModuleInstall(ctx, "app", as.BaseModuleName())
|
||||
}
|
||||
ctx.InstallFile(installDir, as.masterFile", as.packedOutput)
|
||||
*/
|
||||
}
|
||||
|
||||
// android_app_set extracts a set of APKs based on the target device
|
||||
// configuration and installs this set as "split APKs".
|
||||
// The set will always contain `base-master.apk` and every APK built
|
||||
// to the target device. All density-specific APK will be included, too,
|
||||
// unless PRODUCT_APPT_PREBUILT_DPI is defined (should contain comma-sepearated
|
||||
// list of density names (LDPI, MDPI, HDPI, etc.)
|
||||
func AndroidApkSetFactory() android.Module {
|
||||
module := &AndroidAppSet{}
|
||||
module.AddProperties(&module.properties)
|
||||
InitJavaModule(module, android.DeviceSupported)
|
||||
android.InitSingleSourcePrebuiltModule(module, &module.properties, "Set")
|
||||
return module
|
||||
}
|
||||
|
||||
// AndroidManifest.xml merging
|
||||
|
Reference in New Issue
Block a user