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

Commit 1598abf6 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge changes from topic "sharedlib_in_recovery" 

am: 33ab6f61

Change-Id: I0cfce2564ba7e785bbb4db43626155cce3302ecc
parents eb946e12 33ab6f61

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