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

Commit 23a6a41c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "bootstrap is added for cc_binary only when the module is in an APEX"

parents 4d947f0e 89f7bf16

cc/binary.go

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) { 
	// The original path becomes a symlink to the corresponding file in the

	// runtime APEX.

	translatedArch := ctx.Target().NativeBridge == android.NativeBridgeEnabled

	if InstallToBootstrap(ctx.baseModuleName(), ctx.Config()) && !translatedArch && ctx.apexVariationName() == "" && !ctx.inRamdisk() && !ctx.inRecovery() {

	if android.DirectlyInAnyApex(ctx, ctx.ModuleName()) && InstallToBootstrap(ctx.baseModuleName(), ctx.Config()) && !translatedArch && ctx.apexVariationName() == "" && !ctx.inRamdisk() && !ctx.inRecovery() {

		if ctx.Device() && isBionic(ctx.baseModuleName()) {

			binary.installSymlinkToRuntimeApex(ctx, file)

		}