diff options
| author | 2024-12-03 01:08:26 +0000 | |
|---|---|---|
| committer | 2024-12-03 01:08:26 +0000 | |
| commit | 4a97ff1c5f4884089cb0039f1ae02bf80aaaf54b (patch) | |
| tree | de572a2721413168bc94e2938fb9e9e861ff9d53 /apex/apex_test.go | |
| parent | 96d076e26288224a3758db1a4f49eb3f83f48b7c (diff) | |
| parent | 45e4001f7a4c4e30e237a8f8a00d9b352785f31a (diff) | |
Merge "Move withNativeBridgeEnabled to build/soong/android" into main
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 6cdb225ff..27c0340de 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -84,26 +84,6 @@ func withFiles(files android.MockFS) android.FixturePreparer { return files.AddToFixture() } -// withNativeBridgeTargets sets configuration with targets including: -// - X86_64 (primary) -// - X86 (secondary) -// - Arm64 on X86_64 (native bridge) -// - Arm on X86 (native bridge) -var withNativeBridgeEnabled = android.FixtureModifyConfig( - func(config android.Config) { - config.Targets[android.Android] = []android.Target{ - {Os: android.Android, Arch: android.Arch{ArchType: android.X86_64, ArchVariant: "silvermont", Abi: []string{"arm64-v8a"}}, - NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""}, - {Os: android.Android, Arch: android.Arch{ArchType: android.X86, ArchVariant: "silvermont", Abi: []string{"armeabi-v7a"}}, - NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""}, - {Os: android.Android, Arch: android.Arch{ArchType: android.Arm64, ArchVariant: "armv8-a", Abi: []string{"arm64-v8a"}}, - NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "x86_64", NativeBridgeRelativePath: "arm64"}, - {Os: android.Android, Arch: android.Arch{ArchType: android.Arm, ArchVariant: "armv7-a-neon", Abi: []string{"armeabi-v7a"}}, - NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "x86", NativeBridgeRelativePath: "arm"}, - } - }, -) - func withManifestPackageNameOverrides(specs []string) android.FixturePreparer { return android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { variables.ManifestPackageNameOverrides = specs @@ -3198,7 +3178,7 @@ func TestFilesInSubDirWhenNativeBridgeEnabled(t *testing.T) { }, }, } - `, withNativeBridgeEnabled) + `, android.PrepareForNativeBridgeEnabled) ensureExactContents(t, ctx, "myapex", "android_common_myapex", []string{ "bin/foo/bar/mybin", "bin/foo/bar/mybin64", |