diff options
| author | 2021-04-01 21:35:20 +0900 | |
|---|---|---|
| committer | 2021-04-05 09:32:06 +0900 | |
| commit | f58c46e36fbffc3422097529987d16ac1cf503f5 (patch) | |
| tree | b0bf1a080107a0bf5cfaff9ce1998527ecca86f7 /sysprop/sysprop_test.go | |
| parent | 54105c48f4496d7d5dcb3c6a4c6179266dfffc8c (diff) | |
Don't use incorrect version names like VER or BOARD even in tests
All version names will go through ApiLevelFromUser which triggers an
error when the name is not a valid one.
Bug: 175678607
Test: m
Change-Id: Id33bf64085603914d45ad7942cb8908a4734493f
Diffstat (limited to 'sysprop/sysprop_test.go')
| -rw-r--r-- | sysprop/sysprop_test.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index f42f9e902..6d35f9cd6 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -129,7 +129,7 @@ func test(t *testing.T, bp string) *android.TestResult { android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { variables.DeviceSystemSdkVersions = []string{"28"} variables.DeviceVndkVersion = proptools.StringPtr("current") - variables.Platform_vndk_version = proptools.StringPtr("VER") + variables.Platform_vndk_version = proptools.StringPtr("29") }), mockFS.AddToFixture(), android.FixtureWithRootAndroidBp(bp), @@ -246,10 +246,10 @@ func TestSyspropLibrary(t *testing.T) { // Check for generated cc_library for _, variant := range []string{ - "android_vendor.VER_arm_armv7-a-neon_shared", - "android_vendor.VER_arm_armv7-a-neon_static", - "android_vendor.VER_arm64_armv8-a_shared", - "android_vendor.VER_arm64_armv8-a_static", + "android_vendor.29_arm_armv7-a-neon_shared", + "android_vendor.29_arm_armv7-a-neon_static", + "android_vendor.29_arm64_armv8-a_shared", + "android_vendor.29_arm64_armv8-a_static", } { result.ModuleForTests("libsysprop-platform", variant) result.ModuleForTests("libsysprop-vendor", variant) @@ -277,15 +277,15 @@ func TestSyspropLibrary(t *testing.T) { // Check for exported includes coreVariant := "android_arm64_armv8-a_static" - vendorVariant := "android_vendor.VER_arm64_armv8-a_static" + vendorVariant := "android_vendor.29_arm64_armv8-a_static" platformInternalPath := "libsysprop-platform/android_arm64_armv8-a_static/gen/sysprop/include" platformPublicCorePath := "libsysprop-platform/android_arm64_armv8-a_static/gen/sysprop/public/include" - platformPublicVendorPath := "libsysprop-platform/android_vendor.VER_arm64_armv8-a_static/gen/sysprop/public/include" + platformPublicVendorPath := "libsysprop-platform/android_vendor.29_arm64_armv8-a_static/gen/sysprop/public/include" platformOnProductPath := "libsysprop-platform-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include" - vendorInternalPath := "libsysprop-vendor/android_vendor.VER_arm64_armv8-a_static/gen/sysprop/include" + vendorInternalPath := "libsysprop-vendor/android_vendor.29_arm64_armv8-a_static/gen/sysprop/include" vendorPublicPath := "libsysprop-vendor-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include" platformClient := result.ModuleForTests("cc-client-platform", coreVariant) |