Use Targets[Android] instead of DeviceArch funcs. am: 829b7135f3

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

Change-Id: I216e04656108c7d7c7b35d39fa70f82ef656d38a
This commit is contained in:
Jaewoong Jung
2020-06-10 21:50:16 +00:00
committed by Automerger Merge Worker
3 changed files with 26 additions and 22 deletions

View File

@@ -5123,8 +5123,10 @@ func TestApexSet(t *testing.T) {
}
`, func(fs map[string][]byte, config android.Config) {
config.TestProductVariables.Platform_sdk_version = intPtr(30)
config.TestProductVariables.DeviceArch = proptools.StringPtr("arm")
config.TestProductVariables.DeviceSecondaryArch = proptools.StringPtr("arm64")
config.Targets[android.Android] = []android.Target{
{Os: android.Android, Arch: android.Arch{ArchType: android.Arm, ArchVariant: "armv7-a-neon", Abi: []string{"armeabi-v7a"}}},
{Os: android.Android, Arch: android.Arch{ArchType: android.Arm64, ArchVariant: "armv8-a", Abi: []string{"arm64-v8a"}}},
}
})
m := ctx.ModuleForTests("myapex", "android_common")