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

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

Merge changes from topic "sharedlib_in_recovery" am: 33ab6f61 am: 1598abf6

am: 7e79089b

Change-Id: Ic49c247ad846e326dff5336f2ea6eae7249c3860
parents 6ab8c166 7e79089b
Loading
Loading
Loading
Loading
+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