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

Commit 93ca271c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Vendor apex sets "vndkVersion" when it uses vndk libs" am: da629082 

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



Change-Id: Ie7557b723485adc600f52e5bbd585a6ce0d4721d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33330431 da629082

apex/apex.go

+16 −7
Original line number Diff line number Diff line
@@ -734,12 +734,14 @@ func (a *apexBundle) combineProperties(ctx android.BottomUpMutatorContext) { 
	}

}



// getImageVariation returns the image variant name for this apexBundle. In most cases, it's simply

// android.CoreVariation, but gets complicated for the vendor APEXes and the VNDK APEX.

func (a *apexBundle) getImageVariation(ctx android.BottomUpMutatorContext) string {

	deviceConfig := ctx.DeviceConfig()

// getImageVariationPair returns a pair for the image variation name as its

// prefix and suffix. The prefix indicates whether it's core/vendor/product and the

// suffix indicates the vndk version when it's vendor or product.

// getImageVariation can simply join the result of this function to get the

// image variation name.

func (a *apexBundle) getImageVariationPair(deviceConfig android.DeviceConfig) (string, string) {

	if a.vndkApex {

		return cc.VendorVariationPrefix + a.vndkVersion(deviceConfig)

		return cc.VendorVariationPrefix, a.vndkVersion(deviceConfig)

	}



	var prefix string
@@ -757,10 +759,17 @@ func (a *apexBundle) getImageVariation(ctx android.BottomUpMutatorContext) strin 
		vndkVersion = deviceConfig.PlatformVndkVersion()

	}

	if vndkVersion != "" {

		return prefix + vndkVersion

		return prefix, vndkVersion

	}



	return android.CoreVariation, "" // The usual case

}



	return android.CoreVariation // The usual case

// getImageVariation returns the image variant name for this apexBundle. In most cases, it's simply

// android.CoreVariation, but gets complicated for the vendor APEXes and the VNDK APEX.

func (a *apexBundle) getImageVariation(ctx android.BottomUpMutatorContext) string {

	prefix, vndkVersion := a.getImageVariationPair(ctx.DeviceConfig())

	return prefix + vndkVersion

}



func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {

apex/builder.go

+6 −0
Original line number Diff line number Diff line
@@ -235,6 +235,12 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
		optCommands = append(optCommands, "-a jniLibs "+strings.Join(jniLibs, " "))

	}



	if android.InList(":vndk", requireNativeLibs) {

		if _, vndkVersion := a.getImageVariationPair(ctx.DeviceConfig()); vndkVersion != "" {

			optCommands = append(optCommands, "-v vndkVersion "+vndkVersion)

		}

	}



	manifestJsonFullOut := android.PathForModuleOut(ctx, "apex_manifest_full.json")

	defaultVersion := android.DefaultUpdatableModuleVersion

	if override := ctx.Config().Getenv("OVERRIDE_APEX_MANIFEST_DEFAULT_VERSION"); override != "" {