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

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

Merge "Install symlink to the runtime APEX only for device"

parents cd2e5287 c3e2c86c

cc/binary.go

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

	// runtime APEX.

	if isBionic(ctx.baseModuleName()) && ctx.Arch().Native && ctx.apexName() == "" && !ctx.inRecovery() {

		if ctx.Device() {

			binary.installSymlinkToRuntimeApex(ctx, file)

		}

		binary.baseInstaller.subDir = "bootstrap"

	}

	binary.baseInstaller.install(ctx, file)

cc/library.go

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

			// runtime APEX.

			if isBionic(ctx.baseModuleName()) && !library.buildStubs() && ctx.Arch().Native && !ctx.inRecovery() {

				if ctx.Device() {

					library.installSymlinkToRuntimeApex(ctx, file)

				}

				library.baseInstaller.subDir = "bootstrap"

			}

		}