Merge "Add -D__ANDROID_NATIVE_BRIDGE__ to native_bridge targets" am: f18c623c04 am: a5aa453308 (99404342) · Commits · e / os / android_build_soong

android/arch.go

+5 −30

Original line number	Diff line number	Diff line
		@@ -1434,20 +1434,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)
		@@ -1594,27 +1589,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
		@@ -358,6 +358,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