diff options
Diffstat (limited to 'java/android_manifest.go')
| -rw-r--r-- | java/android_manifest.go | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/java/android_manifest.go b/java/android_manifest.go index 8280cb1b1..331f941ec 100644 --- a/java/android_manifest.go +++ b/java/android_manifest.go @@ -21,6 +21,7 @@ import ( "github.com/google/blueprint" "android/soong/android" + "android/soong/dexpreopt" ) var manifestFixerRule = pctx.AndroidStaticRule("manifestFixer", @@ -41,29 +42,20 @@ var manifestMergerRule = pctx.AndroidStaticRule("manifestMerger", }, "args", "libs") -// These two libs are added as optional dependencies (<uses-library> with -// android:required set to false). This is because they haven't existed in pre-P -// devices, but classes in them were in bootclasspath jars, etc. So making them -// hard dependencies (android:required=true) would prevent apps from being -// installed to such legacy devices. -var optionalUsesLibs = []string{ - "android.test.base", - "android.test.mock", -} - // Uses manifest_fixer.py to inject minSdkVersion, etc. into an AndroidManifest.xml -func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext sdkContext, sdkLibraries []string, - isLibrary, useEmbeddedNativeLibs, usesNonSdkApis, useEmbeddedDex, hasNoCode bool, loggingParent string) android.Path { +func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext android.SdkContext, + classLoaderContexts dexpreopt.ClassLoaderContextMap, isLibrary, useEmbeddedNativeLibs, usesNonSdkApis, + useEmbeddedDex, hasNoCode bool, loggingParent string) android.Path { var args []string if isLibrary { args = append(args, "--library") } else { - minSdkVersion, err := sdkContext.minSdkVersion().effectiveVersion(ctx) + minSdkVersion, err := sdkContext.MinSdkVersion(ctx).EffectiveVersion(ctx) if err != nil { ctx.ModuleErrorf("invalid minSdkVersion: %s", err) } - if minSdkVersion >= 23 { + if minSdkVersion.FinalOrFutureInt() >= 23 { args = append(args, fmt.Sprintf("--extract-native-libs=%v", !useEmbeddedNativeLibs)) } else if useEmbeddedNativeLibs { ctx.ModuleErrorf("module attempted to store uncompressed native libraries, but minSdkVersion=%d doesn't support it", @@ -79,8 +71,8 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext args = append(args, "--use-embedded-dex") } - for _, usesLib := range sdkLibraries { - if inList(usesLib, optionalUsesLibs) { + for _, usesLib := range classLoaderContexts.UsesLibs() { + if inList(usesLib, dexpreopt.OptionalCompatUsesLibs) { args = append(args, "--optional-uses-library", usesLib) } else { args = append(args, "--uses-library", usesLib) @@ -95,20 +87,20 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext args = append(args, "--logging-parent", loggingParent) } var deps android.Paths - targetSdkVersion, err := sdkContext.targetSdkVersion().effectiveVersionString(ctx) + targetSdkVersion, err := sdkContext.TargetSdkVersion(ctx).EffectiveVersionString(ctx) if err != nil { ctx.ModuleErrorf("invalid targetSdkVersion: %s", err) } - if UseApiFingerprint(ctx) { + if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" { targetSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String()) deps = append(deps, ApiFingerprintPath(ctx)) } - minSdkVersion, err := sdkContext.minSdkVersion().effectiveVersionString(ctx) + minSdkVersion, err := sdkContext.MinSdkVersion(ctx).EffectiveVersionString(ctx) if err != nil { ctx.ModuleErrorf("invalid minSdkVersion: %s", err) } - if UseApiFingerprint(ctx) { + if UseApiFingerprint(ctx) && ctx.ModuleName() != "framework-res" { minSdkVersion = ctx.Config().PlatformSdkCodename() + fmt.Sprintf(".$$(cat %s)", ApiFingerprintPath(ctx).String()) deps = append(deps, ApiFingerprintPath(ctx)) } @@ -130,7 +122,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext }, }) - return fixedManifest + return fixedManifest.WithoutRel() } func manifestMerger(ctx android.ModuleContext, manifest android.Path, staticLibManifests android.Paths, @@ -155,5 +147,5 @@ func manifestMerger(ctx android.ModuleContext, manifest android.Path, staticLibM }, }) - return mergedManifest + return mergedManifest.WithoutRel() } |