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

Commit 402be41a authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Remove old-style support for translated second architectures" 

This reverts commit fe6330c7.

Reason for revert: this was accidentally propping up NDK builds
Bug: 141242600
Change-Id: Ie9f8e31479a74e8e9e14d720a5936da6b1d5d113
parent fe6330c7

android/arch.go

+8 −1
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ type Arch struct { 
	CpuVariant   string

	Abi          []string

	ArchFeatures []string

	Native       bool

}



func (a Arch) String() string {
@@ -1481,6 +1482,11 @@ func decodeTargetProductVariables(config *config) (map[OsType][]Target, error) { 
			addTarget(Android, *variables.DeviceSecondaryArch,

				variables.DeviceSecondaryArchVariant, variables.DeviceSecondaryCpuVariant,

				variables.DeviceSecondaryAbi, NativeBridgeDisabled, nil, nil)



			deviceArches := targets[Android]

			if deviceArches[0].Arch.ArchType.Multilib == deviceArches[1].Arch.ArchType.Multilib {

				deviceArches[1].Arch.Native = false

			}

		}



		if variables.NativeBridgeArch != nil && *variables.NativeBridgeArch != "" {
@@ -1628,7 +1634,7 @@ func decodeArchSettings(os OsType, archConfigs []archConfig) ([]Target, error) { 
		if err != nil {

			return nil, err

		}



		arch.Native = false

		ret = append(ret, Target{

			Os:   Android,

			Arch: arch,
@@ -1657,6 +1663,7 @@ func decodeArch(os OsType, arch string, archVariant, cpuVariant *string, abi []s 
		ArchVariant: stringPtr(archVariant),

		CpuVariant:  stringPtr(cpuVariant),

		Abi:         abi,

		Native:      true,

	}



	if a.ArchVariant == a.ArchType.Name || a.ArchVariant == "generic" {

android/config.go

+20 −7
Original line number Diff line number Diff line
@@ -240,10 +240,10 @@ func TestArchConfigNativeBridge(buildDir string, env map[string]string) Config { 
	config := testConfig.config



	config.Targets[Android] = []Target{

		{Android, Arch{ArchType: X86_64, ArchVariant: "silvermont", Abi: []string{"arm64-v8a"}}, NativeBridgeDisabled, "", ""},

		{Android, Arch{ArchType: X86, ArchVariant: "silvermont", Abi: []string{"armeabi-v7a"}}, NativeBridgeDisabled, "", ""},

		{Android, Arch{ArchType: Arm64, ArchVariant: "armv8-a", Abi: []string{"arm64-v8a"}}, NativeBridgeEnabled, "x86_64", "arm64"},

		{Android, Arch{ArchType: Arm, ArchVariant: "armv7-a-neon", Abi: []string{"armeabi-v7a"}}, NativeBridgeEnabled, "x86", "arm"},

		{Android, Arch{ArchType: X86_64, ArchVariant: "silvermont", Native: true, Abi: []string{"arm64-v8a"}}, NativeBridgeDisabled, "", ""},

		{Android, Arch{ArchType: X86, ArchVariant: "silvermont", Native: true, Abi: []string{"armeabi-v7a"}}, NativeBridgeDisabled, "", ""},

		{Android, Arch{ArchType: Arm64, ArchVariant: "armv8-a", Native: true, Abi: []string{"arm64-v8a"}}, NativeBridgeEnabled, "x86_64", "arm64"},

		{Android, Arch{ArchType: Arm, ArchVariant: "armv7-a-neon", Native: true, Abi: []string{"armeabi-v7a"}}, NativeBridgeEnabled, "x86", "arm"},

	}



	return testConfig
@@ -255,7 +255,7 @@ func TestArchConfigFuchsia(buildDir string, env map[string]string) Config { 


	config.Targets = map[OsType][]Target{

		Fuchsia: []Target{

			{Fuchsia, Arch{ArchType: Arm64, ArchVariant: ""}, NativeBridgeDisabled, "", ""},

			{Fuchsia, Arch{ArchType: Arm64, ArchVariant: "", Native: true}, NativeBridgeDisabled, "", ""},

		},

		BuildOs: []Target{

			{BuildOs, Arch{ArchType: X86_64}, NativeBridgeDisabled, "", ""},
@@ -272,8 +272,8 @@ func TestArchConfig(buildDir string, env map[string]string) Config { 


	config.Targets = map[OsType][]Target{

		Android: []Target{

			{Android, Arch{ArchType: Arm64, ArchVariant: "armv8-a", Abi: []string{"arm64-v8a"}}, NativeBridgeDisabled, "", ""},

			{Android, Arch{ArchType: Arm, ArchVariant: "armv7-a-neon", Abi: []string{"armeabi-v7a"}}, NativeBridgeDisabled, "", ""},

			{Android, Arch{ArchType: Arm64, ArchVariant: "armv8-a", Native: true, Abi: []string{"arm64-v8a"}}, NativeBridgeDisabled, "", ""},

			{Android, Arch{ArchType: Arm, ArchVariant: "armv7-a-neon", Native: true, Abi: []string{"armeabi-v7a"}}, NativeBridgeDisabled, "", ""},

		},

		BuildOs: []Target{

			{BuildOs, Arch{ArchType: X86_64}, NativeBridgeDisabled, "", ""},
@@ -1009,6 +1009,19 @@ func findOverrideValue(overrides []string, name string, errorMsg string) (newVal 
	return "", false

}



// SecondArchIsTranslated returns true if the primary device arch is X86 or X86_64 and the device also has an arch

// that is Arm or Arm64.

func (c *config) SecondArchIsTranslated() bool {

	deviceTargets := c.Targets[Android]

	if len(deviceTargets) < 2 {

		return false

	}



	arch := deviceTargets[0].Arch



	return (arch.ArchType == X86 || arch.ArchType == X86_64) && hasArmAndroidArch(deviceTargets)

}



func (c *config) IntegerOverflowDisabledForPath(path string) bool {

	if c.productVariables.IntegerOverflowExcludePaths == nil {

		return false

apex/apex.go

+6 −2
Original line number Diff line number Diff line
@@ -829,7 +829,9 @@ func getCopyManifestForNativeLibrary(ccMod *cc.Module, config android.Config, ha 
		dirInApex = "lib64"

	}

	dirInApex = filepath.Join(dirInApex, ccMod.RelativeInstallPath())

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

	if !ccMod.Arch().Native {

		dirInApex = filepath.Join(dirInApex, ccMod.Arch().ArchType.String())

	} else if ccMod.Target().NativeBridge == android.NativeBridgeEnabled {

		dirInApex = filepath.Join(dirInApex, ccMod.Target().NativeBridgeRelativePath)

	}

	if handleSpecialLibs && cc.InstallToBootstrap(ccMod.BaseModuleName(), config) {
@@ -852,7 +854,9 @@ func getCopyManifestForNativeLibrary(ccMod *cc.Module, config android.Config, ha 


func getCopyManifestForExecutable(cc *cc.Module) (fileToCopy android.Path, dirInApex string) {

	dirInApex = filepath.Join("bin", cc.RelativeInstallPath())

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

	if !cc.Arch().Native {

		dirInApex = filepath.Join(dirInApex, cc.Arch().ArchType.String())

	} else if cc.Target().NativeBridge == android.NativeBridgeEnabled {

		dirInApex = filepath.Join(dirInApex, cc.Target().NativeBridgeRelativePath)

	}

	fileToCopy = cc.OutputFile().Path()

apex/apex_test.go

+4 −4
Original line number Diff line number Diff line
@@ -1467,10 +1467,10 @@ func TestVndkApexSkipsNativeBridgeSupportedModules(t *testing.T) { 
		}

	`, withTargets(map[android.OsType][]android.Target{

		android.Android: []android.Target{

			{Os: android.Android, Arch: android.Arch{ArchType: android.Arm64, ArchVariant: "armv8-a", Abi: []string{"arm64-v8a"}}, NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""},

			{Os: android.Android, Arch: android.Arch{ArchType: android.Arm, ArchVariant: "armv7-a-neon", Abi: []string{"armeabi-v7a"}}, NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""},

			{Os: android.Android, Arch: android.Arch{ArchType: android.X86_64, ArchVariant: "silvermont", Abi: []string{"arm64-v8a"}}, NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "arm64", NativeBridgeRelativePath: "x86_64"},

			{Os: android.Android, Arch: android.Arch{ArchType: android.X86, ArchVariant: "silvermont", Abi: []string{"armeabi-v7a"}}, NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "arm", NativeBridgeRelativePath: "x86"},

			{Os: android.Android, Arch: android.Arch{ArchType: android.Arm64, ArchVariant: "armv8-a", Native: true, Abi: []string{"arm64-v8a"}}, NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""},

			{Os: android.Android, Arch: android.Arch{ArchType: android.Arm, ArchVariant: "armv7-a-neon", Native: true, Abi: []string{"armeabi-v7a"}}, NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""},

			{Os: android.Android, Arch: android.Arch{ArchType: android.X86_64, ArchVariant: "silvermont", Native: true, Abi: []string{"arm64-v8a"}}, NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "arm64", NativeBridgeRelativePath: "x86_64"},

			{Os: android.Android, Arch: android.Arch{ArchType: android.X86, ArchVariant: "silvermont", Native: true, Abi: []string{"armeabi-v7a"}}, NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "arm", NativeBridgeRelativePath: "x86"},

		},

	}))

cc/binary.go

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) { 
	// Bionic binaries (e.g. linker) is installed to the bootstrap subdirectory.

	// The original path becomes a symlink to the corresponding file in the

	// runtime APEX.

	translatedArch := ctx.Target().NativeBridge == android.NativeBridgeEnabled

	translatedArch := ctx.Target().NativeBridge == android.NativeBridgeEnabled || !ctx.Arch().Native

	if InstallToBootstrap(ctx.baseModuleName(), ctx.Config()) && !translatedArch && ctx.apexName() == "" && !ctx.inRecovery() {

		if ctx.Device() && isBionic(ctx.baseModuleName()) {

			binary.installSymlinkToRuntimeApex(ctx, file)