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

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

Merge changes from topic "sharedlib_in_recovery" 

* changes:
  Recovery variants are built with -D__ANDROID_RECOVERY__
  Recovery partition has same layout as system
parents 4038a6ea d54aee57

android/paths.go

+2 −1
Original line number Diff line number Diff line
@@ -950,7 +950,8 @@ func PathForModuleInstall(ctx ModuleInstallPathContext, pathComponents ...string 
		if ctx.InstallInData() {

			partition = "data"

		} else if ctx.InstallInRecovery() {

			partition = "recovery/root"

			// the layout of recovery partion is the same as that of system partition

			partition = "recovery/root/system"

		} else if ctx.SocSpecific() {

			partition = ctx.DeviceConfig().VendorPath()

		} else if ctx.DeviceSpecific() {

cc/binary.go

+0 −5
Original line number Diff line number Diff line
@@ -357,11 +357,6 @@ func (binary *binaryDecorator) link(ctx ModuleContext, 
}



func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) {

	// <recovery>/bin is a symlink to /system/bin. Recovery binaries are all in /sbin.

	if ctx.inRecovery() {

		binary.baseInstaller.dir = "sbin"

	}



	binary.baseInstaller.install(ctx, file)

	for _, symlink := range binary.Properties.Symlinks {

		binary.symlinks = append(binary.symlinks,

cc/compiler.go

+4 −0
Original line number Diff line number Diff line
@@ -332,6 +332,10 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
			"-D__ANDROID_API__="+version, "-D__ANDROID_VNDK__")

	}



	if ctx.inRecovery() {

		flags.GlobalFlags = append(flags.GlobalFlags, "-D__ANDROID_RECOVERY__")

	}



	instructionSet := String(compiler.Properties.Instruction_set)

	if flags.RequiredInstructionSet != "" {

		instructionSet = flags.RequiredInstructionSet