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

Merge "Manifest Fixer Params code refactor" am: 7761de5d4e am: bdf5b8030e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1979469

Change-Id: I86654c0f5ba939b7c8addb9dfc28596754f8e826
This commit is contained in:
Gurpreet Singh
2022-02-10 18:39:26 +00:00
committed by Automerger Merge Worker
parent 1e8401a799 bdf5b8030e
commit 5f93fb0f44
3 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apex/builder.go
View File

@@ -398,18 +398,8 @@ func (a *apexBundle) buildBundleConfig(ctx android.ModuleContext) android.Output
} }
func markManifestTestOnly(ctx android.ModuleContext, androidManifestFile android.Path) android.Path { func markManifestTestOnly(ctx android.ModuleContext, androidManifestFile android.Path) android.Path {
return java.ManifestFixer(java.ManifestFixerParams{ return java.ManifestFixer(ctx, androidManifestFile, java.ManifestFixerParams{
Ctx: ctx, TestOnly: true,
Manifest: androidManifestFile,
SdkContext: nil,
ClassLoaderContexts: nil,
IsLibrary: false,
UseEmbeddedNativeLibs: false,
UsesNonSdkApis: false,
UseEmbeddedDex: false,
HasNoCode: false,
TestOnly: true,
LoggingParent: "",
}) })
} }

5
java/aar.go
View File

@@ -280,9 +280,7 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkCon
manifestFile := proptools.StringDefault(a.aaptProperties.Manifest, "AndroidManifest.xml") manifestFile := proptools.StringDefault(a.aaptProperties.Manifest, "AndroidManifest.xml")
manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile) manifestSrcPath := android.PathForModuleSrc(ctx, manifestFile)
manifestPath := ManifestFixer(ManifestFixerParams{ manifestPath := ManifestFixer(ctx, manifestSrcPath, ManifestFixerParams{
Ctx: ctx,
Manifest: manifestSrcPath,
SdkContext: sdkContext, SdkContext: sdkContext,
ClassLoaderContexts: classLoaderContexts, ClassLoaderContexts: classLoaderContexts,
IsLibrary: a.isLibrary, IsLibrary: a.isLibrary,
@@ -290,7 +288,6 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext android.SdkCon
UsesNonSdkApis: a.usesNonSdkApis, UsesNonSdkApis: a.usesNonSdkApis,
UseEmbeddedDex: a.useEmbeddedDex, UseEmbeddedDex: a.useEmbeddedDex,
HasNoCode: a.hasNoCode, HasNoCode: a.hasNoCode,
TestOnly: false,
LoggingParent: a.LoggingParent, LoggingParent: a.LoggingParent,
}) })

37
java/android_manifest.go
View File

@@ -56,8 +56,6 @@ func targetSdkVersionForManifestFixer(ctx android.ModuleContext, sdkContext andr
} }
type ManifestFixerParams struct { type ManifestFixerParams struct {
Ctx android.ModuleContext
Manifest android.Path
SdkContext android.SdkContext SdkContext android.SdkContext
ClassLoaderContexts dexpreopt.ClassLoaderContextMap ClassLoaderContexts dexpreopt.ClassLoaderContextMap
IsLibrary bool IsLibrary bool
@@ -70,20 +68,21 @@ type ManifestFixerParams struct {
} }
// Uses manifest_fixer.py to inject minSdkVersion, etc. into an AndroidManifest.xml // Uses manifest_fixer.py to inject minSdkVersion, etc. into an AndroidManifest.xml
func ManifestFixer(params ManifestFixerParams) android.Path { func ManifestFixer(ctx android.ModuleContext, manifest android.Path,
params ManifestFixerParams) android.Path {
var args []string var args []string
if params.IsLibrary { if params.IsLibrary {
args = append(args, "--library") args = append(args, "--library")
} else if params.SdkContext != nil { } else if params.SdkContext != nil {
minSdkVersion, err := params.SdkContext.MinSdkVersion(params.Ctx).EffectiveVersion(params.Ctx) minSdkVersion, err := params.SdkContext.MinSdkVersion(ctx).EffectiveVersion(ctx)
if err != nil { if err != nil {
params.Ctx.ModuleErrorf("invalid minSdkVersion: %s", err) ctx.ModuleErrorf("invalid minSdkVersion: %s", err)
} }
if minSdkVersion.FinalOrFutureInt() >= 23 { if minSdkVersion.FinalOrFutureInt() >= 23 {
args = append(args, fmt.Sprintf("--extract-native-libs=%v", !params.UseEmbeddedNativeLibs)) args = append(args, fmt.Sprintf("--extract-native-libs=%v", !params.UseEmbeddedNativeLibs))
} else if params.UseEmbeddedNativeLibs { } else if params.UseEmbeddedNativeLibs {
params.Ctx.ModuleErrorf("module attempted to store uncompressed native libraries, but minSdkVersion=%d doesn't support it", ctx.ModuleErrorf("module attempted to store uncompressed native libraries, but minSdkVersion=%d doesn't support it",
minSdkVersion) minSdkVersion)
} }
} }
@@ -124,38 +123,38 @@ func ManifestFixer(params ManifestFixerParams) android.Path {
var argsMapper = make(map[string]string) var argsMapper = make(map[string]string)
if params.SdkContext != nil { if params.SdkContext != nil {
targetSdkVersion := targetSdkVersionForManifestFixer(params.Ctx, params.SdkContext) targetSdkVersion := targetSdkVersionForManifestFixer(ctx, params.SdkContext)
args = append(args, "--targetSdkVersion ", targetSdkVersion) args = append(args, "--targetSdkVersion ", targetSdkVersion)
if UseApiFingerprint(params.Ctx) && params.Ctx.ModuleName() != "framework-res" { if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" {
targetSdkVersion = params.Ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(params.Ctx).String()) targetSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String())
deps = append(deps, ApiFingerprintPath(params.Ctx)) deps = append(deps, ApiFingerprintPath(ctx))
} }
minSdkVersion, err := params.SdkContext.MinSdkVersion(params.Ctx).EffectiveVersionString(params.Ctx) minSdkVersion, err := params.SdkContext.MinSdkVersion(ctx).EffectiveVersionString(ctx)
if err != nil { if err != nil {
params.Ctx.ModuleErrorf("invalid minSdkVersion: %s", err) ctx.ModuleErrorf("invalid minSdkVersion: %s", err)
} }
if UseApiFingerprint(params.Ctx) && params.Ctx.ModuleName() != "framework-res" { if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" {
minSdkVersion = params.Ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(params.Ctx).String()) minSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String())
deps = append(deps, ApiFingerprintPath(params.Ctx)) deps = append(deps, ApiFingerprintPath(ctx))
} }
if err != nil { if err != nil {
params.Ctx.ModuleErrorf("invalid minSdkVersion: %s", err) ctx.ModuleErrorf("invalid minSdkVersion: %s", err)
} }
args = append(args, "--minSdkVersion ", minSdkVersion) args = append(args, "--minSdkVersion ", minSdkVersion)
args = append(args, "--raise-min-sdk-version") args = append(args, "--raise-min-sdk-version")
} }
fixedManifest := android.PathForModuleOut(params.Ctx, "manifest_fixer", "AndroidManifest.xml") fixedManifest := android.PathForModuleOut(ctx, "manifest_fixer", "AndroidManifest.xml")
argsMapper["args"] = strings.Join(args, " ") argsMapper["args"] = strings.Join(args, " ")
params.Ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: manifestFixerRule, Rule: manifestFixerRule,
Description: "fix manifest", Description: "fix manifest",
Input: params.Manifest, Input: manifest,
Implicits: deps, Implicits: deps,
Output: fixedManifest, Output: fixedManifest,
Args: argsMapper, Args: argsMapper,