StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert shared customizer functions to return FixturePreparers" am: 7ba0448314 am: 47e8b9af4e am: 85ca23b70e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1647197

Change-Id: I223001416be6cc38c55ae4415536a0740a43e48f
This commit is contained in:
Paul Duffin
2021-03-22 10:00:05 +00:00
committed by Automerger Merge Worker
parent 992c564089 85ca23b70e
commit 710c370485
1 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
apex/apex_test.go
View File

@@ -70,20 +70,16 @@ func testApex(t *testing.T, bp string, handlers ...interface{}) *android.TestCon
// deprecated // deprecated
type testCustomizer func(fs map[string][]byte, config android.Config) type testCustomizer func(fs map[string][]byte, config android.Config)
func withFiles(files map[string][]byte) testCustomizer { func withFiles(files android.MockFS) android.FixturePreparer {
return func(fs map[string][]byte, config android.Config) { return files.AddToFixture()
for k, v := range files {
fs[k] = v
}
}
} }
func withTargets(targets map[android.OsType][]android.Target) testCustomizer { func withTargets(targets map[android.OsType][]android.Target) android.FixturePreparer {
return func(fs map[string][]byte, config android.Config) { return android.FixtureModifyConfig(func(config android.Config) {
for k, v := range targets { for k, v := range targets {
config.Targets[k] = v config.Targets[k] = v
} }
} })
} }
// withNativeBridgeTargets sets configuration with targets including: // withNativeBridgeTargets sets configuration with targets including:
@@ -91,32 +87,38 @@ func withTargets(targets map[android.OsType][]android.Target) testCustomizer {
// - X86 (secondary) // - X86 (secondary)
// - Arm64 on X86_64 (native bridge) // - Arm64 on X86_64 (native bridge)
// - Arm on X86 (native bridge) // - Arm on X86 (native bridge)
func withNativeBridgeEnabled(_ map[string][]byte, config android.Config) { var withNativeBridgeEnabled = android.FixtureModifyConfig(
config.Targets[android.Android] = []android.Target{ func(config android.Config) {
{Os: android.Android, Arch: android.Arch{ArchType: android.X86_64, ArchVariant: "silvermont", Abi: []string{"arm64-v8a"}}, config.Targets[android.Android] = []android.Target{
NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""}, {Os: android.Android, Arch: android.Arch{ArchType: android.X86_64, ArchVariant: "silvermont", Abi: []string{"arm64-v8a"}},
{Os: android.Android, Arch: android.Arch{ArchType: android.X86, ArchVariant: "silvermont", Abi: []string{"armeabi-v7a"}}, NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""},
NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""}, {Os: android.Android, Arch: android.Arch{ArchType: android.X86, ArchVariant: "silvermont", Abi: []string{"armeabi-v7a"}},
{Os: android.Android, Arch: android.Arch{ArchType: android.Arm64, ArchVariant: "armv8-a", Abi: []string{"arm64-v8a"}}, NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""},
NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "x86_64", NativeBridgeRelativePath: "arm64"}, {Os: android.Android, Arch: android.Arch{ArchType: android.Arm64, ArchVariant: "armv8-a", Abi: []string{"arm64-v8a"}},
{Os: android.Android, Arch: android.Arch{ArchType: android.Arm, ArchVariant: "armv7-a-neon", Abi: []string{"armeabi-v7a"}}, NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "x86_64", NativeBridgeRelativePath: "arm64"},
NativeBridge: android.NativeBridgeEnabled, NativeBridgeHostArchName: "x86", NativeBridgeRelativePath: "arm"}, {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
})
} }
func withManifestPackageNameOverrides(specs []string) testCustomizer { var withBinder32bit = android.FixtureModifyProductVariables(
return func(fs map[string][]byte, config android.Config) { func(variables android.FixtureProductVariables) {
config.TestProductVariables.ManifestPackageNameOverrides = specs variables.Binder32bit = proptools.BoolPtr(true)
} },
} )
func withBinder32bit(_ map[string][]byte, config android.Config) { var withUnbundledBuild = android.FixtureModifyProductVariables(
config.TestProductVariables.Binder32bit = proptools.BoolPtr(true) func(variables android.FixtureProductVariables) {
} variables.Unbundled_build = proptools.BoolPtr(true)
},
func withUnbundledBuild(_ map[string][]byte, config android.Config) { )
config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true)
}
var emptyFixtureFactory = android.NewFixtureFactory(&buildDir) var emptyFixtureFactory = android.NewFixtureFactory(&buildDir)