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

Commit 05cee446 authored by Victor Khimenko's avatar Victor Khimenko Committed by Automerger Merge Worker
Browse files

Merge "Add -D__ANDROID_NATIVE_BRIDGE__ to native_bridge targets" into rvc-dev am: f81e0a1e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12628920

Change-Id: I042a1c8bee70cf4b27abab0d4ddc831a2f66c0cc
parents 58a912ff f81e0a1e

android/arch.go

+5 −30
Original line number Diff line number Diff line
@@ -1440,20 +1440,15 @@ func (m *ModuleBase) setArchProperties(ctx BottomUpMutatorContext) { 
			//         key: value,

			//     },

			// },

			// TODO(ccross): is this still necessary with native bridge?

			if os.Class == Device {

				if (arch.ArchType == X86 && (hasArmAbi(arch) ||

					hasArmAndroidArch(ctx.Config().Targets[Android]))) ||

					(arch.ArchType == Arm &&

						hasX86AndroidArch(ctx.Config().Targets[Android])) {

				if arch.ArchType == X86 && (hasArmAbi(arch) ||

					hasArmAndroidArch(ctx.Config().Targets[Android])) {

					field := "Arm_on_x86"

					prefix := "target.arm_on_x86"

					m.appendProperties(ctx, genProps, targetProp, field, prefix)

				}

				if (arch.ArchType == X86_64 && (hasArmAbi(arch) ||

					hasArmAndroidArch(ctx.Config().Targets[Android]))) ||

					(arch.ArchType == Arm &&

						hasX8664AndroidArch(ctx.Config().Targets[Android])) {

				if arch.ArchType == X86_64 && (hasArmAbi(arch) ||

					hasArmAndroidArch(ctx.Config().Targets[Android])) {

					field := "Arm_on_x86_64"

					prefix := "target.arm_on_x86_64"

					m.appendProperties(ctx, genProps, targetProp, field, prefix)
@@ -1600,27 +1595,7 @@ func hasArmAbi(arch Arch) bool { 
// hasArmArch returns true if targets has at least non-native_bridge arm Android arch

func hasArmAndroidArch(targets []Target) bool {

	for _, target := range targets {

		if target.Os == Android && target.Arch.ArchType == Arm && target.NativeBridge == NativeBridgeDisabled {

			return true

		}

	}

	return false

}



// hasX86Arch returns true if targets has at least x86 Android arch

func hasX86AndroidArch(targets []Target) bool {

	for _, target := range targets {

		if target.Os == Android && target.Arch.ArchType == X86 {

			return true

		}

	}

	return false

}



// hasX8664Arch returns true if targets has at least x86_64 Android arch

func hasX8664AndroidArch(targets []Target) bool {

	for _, target := range targets {

		if target.Os == Android && target.Arch.ArchType == X86_64 {

		if target.Os == Android && target.Arch.ArchType == Arm {

			return true

		}

	}

cc/compiler.go

+4 −0
Original line number Diff line number Diff line
@@ -333,6 +333,10 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps 
		}

	}



	if ctx.Target().NativeBridge == android.NativeBridgeEnabled {

		flags.Global.CommonFlags = append(flags.Global.CommonFlags, "-D__ANDROID_NATIVE_BRIDGE__")

	}



	instructionSet := String(compiler.Properties.Instruction_set)

	if flags.RequiredInstructionSet != "" {

		instructionSet = flags.RequiredInstructionSet