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

Commit 2fc25bbd authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge changes from topic "uses-libs-21" 

* changes:
  Treat "org.apache.http.legacy" as optional <uses-library> by default.
  Consistently use default install path for compatibility <uses-library>.
parents c977a214 e3bb01df

dexpreopt/config.go

+45 −22
Original line number Diff line number Diff line
@@ -100,6 +100,21 @@ type GlobalSoongConfig struct { 
	ConstructContext android.Path

}



// These libs are added as optional dependencies (<uses-library> with android:required set to false).

// This is because they haven't existed prior to certain SDK version, 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 OptionalCompatUsesLibs = []string{

	"org.apache.http.legacy",

	"android.test.base",

	"android.test.mock",

}



var CompatUsesLibs = []string{

	"android.hidl.base-V1.0-java",

	"android.hidl.manager-V1.0-java",

}



const UnknownInstallLibraryPath = "error"



// LibraryPath contains paths to the library DEX jar on host and on device.
@@ -112,7 +127,29 @@ type LibraryPath struct { 
type LibraryPaths map[string]*LibraryPath



// Add a new library path to the map, unless a path for this library already exists.

func (libPaths LibraryPaths) addLibraryPath(ctx android.PathContext, lib string, hostPath, installPath android.Path) {

// If necessary, check that the build and install paths exist.

func (libPaths LibraryPaths) addLibraryPath(ctx android.ModuleContext, lib string,

	hostPath, installPath android.Path, strict bool) {



	// If missing dependencies are allowed, the build shouldn't fail when a <uses-library> is

	// not found. However, this is likely to result is disabling dexpreopt, as it won't be

	// possible to construct class loader context without on-host and on-device library paths.

	strict = strict && !ctx.Config().AllowMissingDependencies()



	if hostPath == nil && strict {

		android.ReportPathErrorf(ctx, "unknown build path to <uses-library> '%s'", lib)

	}



	if installPath == nil {

		if android.InList(lib, CompatUsesLibs) || android.InList(lib, OptionalCompatUsesLibs) {

			// Assume that compatibility libraries are installed in /system/framework.

			installPath = android.PathForModuleInstall(ctx, "framework", lib+".jar")

		} else if strict {

			android.ReportPathErrorf(ctx, "unknown install path to <uses-library> '%s'", lib)

		}

	}



	// Add a library only if the build and install path to it is known.

	if _, present := libPaths[lib]; !present {

		var devicePath string

		if installPath != nil {
@@ -128,31 +165,17 @@ func (libPaths LibraryPaths) addLibraryPath(ctx android.PathContext, lib string, 
	}

}



// Add a new library path to the map. Ensure that the build path to the library exists.

func (libPaths LibraryPaths) AddLibraryPath(ctx android.PathContext, lib string, hostPath, installPath android.Path) {

	if hostPath != nil && installPath != nil {

		// Add a library only if the build and install path to it is known.

		libPaths.addLibraryPath(ctx, lib, hostPath, installPath)

	} else if ctx.Config().AllowMissingDependencies() {

		// If missing dependencies are allowed, the build shouldn't fail when a <uses-library> is

		// not found. However, this is likely to result is disabling dexpreopt, as it won't be

		// possible to construct class loader context without on-host and on-device library paths.

	} else {

		// Error on libraries with unknown paths.

		if hostPath == nil {

			android.ReportPathErrorf(ctx, "unknown build path to <uses-library> '%s'", lib)

		} else {

			android.ReportPathErrorf(ctx, "unknown install path to <uses-library> '%s'", lib)

		}

	}

// Add a new library path to the map. Enforce checks that the library paths exist.

func (libPaths LibraryPaths) AddLibraryPath(ctx android.ModuleContext, lib string, hostPath, installPath android.Path) {

	libPaths.addLibraryPath(ctx, lib, hostPath, installPath, true)

}



// Add a new library path to the map, if the library exists (name is not nil).

func (libPaths LibraryPaths) MaybeAddLibraryPath(ctx android.PathContext, lib *string, hostPath, installPath android.Path) {

// Don't enforce checks that the library paths exist. Some libraries may be missing from the build,

// but their names still need to be added to <uses-library> tags in the manifest.

func (libPaths LibraryPaths) MaybeAddLibraryPath(ctx android.ModuleContext, lib *string, hostPath, installPath android.Path) {

	if lib != nil {

		// Don't check the build paths, add in any case. Some libraries may be missing from the

		// build, but their names still need to be added to <uses-library> tags in the manifest.

		libPaths.addLibraryPath(ctx, *lib, hostPath, installPath)

		libPaths.addLibraryPath(ctx, *lib, hostPath, installPath, false)

	}

}

java/android_manifest.go

+1 −11
Original line number Diff line number Diff line
@@ -42,16 +42,6 @@ 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 dexpreopt.LibraryPaths,

	isLibrary, useEmbeddedNativeLibs, usesNonSdkApis, useEmbeddedDex, hasNoCode bool, loggingParent string) android.Path {
@@ -81,7 +71,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext 
	}



	for _, usesLib := range android.SortedStringKeys(sdkLibraries) {

		if inList(usesLib, optionalUsesLibs) {

		if inList(usesLib, dexpreopt.OptionalCompatUsesLibs) {

			args = append(args, "--optional-uses-library", usesLib)

		} else {

			args = append(args, "--uses-library", usesLib)

java/app.go

+11 −27
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) { 


	// Add implicit SDK libraries to <uses-library> list.

	for _, usesLib := range android.SortedStringKeys(a.aapt.sdkLibraries) {

		a.usesLibrary.addLib(usesLib, inList(usesLib, optionalUsesLibs))

		a.usesLibrary.addLib(usesLib, inList(usesLib, dexpreopt.OptionalCompatUsesLibs))

	}



	// Check that the <uses-library> list is coherent with the manifest.
@@ -1947,11 +1947,8 @@ func (u *usesLibrary) deps(ctx android.BottomUpMutatorContext, hasFrameworkLibs 
		if hasFrameworkLibs {

			// Dexpreopt needs paths to the dex jars of these libraries in order to construct

			// class loader context for dex2oat. Add them as a dependency with a special tag.

			ctx.AddVariationDependencies(nil, usesLibCompatTag,

				"org.apache.http.legacy",

				"android.hidl.base-V1.0-java",

				"android.hidl.manager-V1.0-java")

			ctx.AddVariationDependencies(nil, usesLibCompatTag, optionalUsesLibs...)

			ctx.AddVariationDependencies(nil, usesLibTag, dexpreopt.CompatUsesLibs...)

			ctx.AddVariationDependencies(nil, usesLibTag, dexpreopt.OptionalCompatUsesLibs...)

		}

	}

}
@@ -1969,27 +1966,14 @@ func (u *usesLibrary) usesLibraryPaths(ctx android.ModuleContext) dexpreopt.Libr 
	usesLibPaths := make(dexpreopt.LibraryPaths)



	if !ctx.Config().UnbundledBuild() {

		ctx.VisitDirectDeps(func(m android.Module) {

			tag := ctx.OtherModuleDependencyTag(m)

			if tag == usesLibTag || tag == usesLibCompatTag {

		ctx.VisitDirectDepsWithTag(usesLibTag, func(m android.Module) {

			dep := ctx.OtherModuleName(m)



			if lib, ok := m.(Dependency); ok {

					buildPath := lib.DexJarBuildPath()

					installPath := lib.DexJarInstallPath()

					if installPath == nil && tag == usesLibCompatTag {

						// assume that compatibility libraries are in /system/framework

						installPath = android.PathForModuleInstall(ctx, "framework", dep+".jar")

					}

					usesLibPaths.AddLibraryPath(ctx, dep, buildPath, installPath)



				usesLibPaths.AddLibraryPath(ctx, dep, lib.DexJarBuildPath(), lib.DexJarInstallPath())

			} else if ctx.Config().AllowMissingDependencies() {

				ctx.AddMissingDependencies([]string{dep})



			} else {

					ctx.ModuleErrorf("module %q in uses_libs or optional_uses_libs must be "+

						"a java library", dep)

				}

				ctx.ModuleErrorf("module %q in uses_libs or optional_uses_libs must be a java library", dep)

			}

		})

	}

java/java.go

+0 −1
Original line number Diff line number Diff line
@@ -570,7 +570,6 @@ var ( 
	certificateTag        = dependencyTag{name: "certificate"}

	instrumentationForTag = dependencyTag{name: "instrumentation_for"}

	usesLibTag            = dependencyTag{name: "uses-library"}

	usesLibCompatTag      = dependencyTag{name: "uses-library-compat"}

	extraLintCheckTag     = dependencyTag{name: "extra-lint-check"}

)