diff options
| author | 2019-12-16 20:54:32 +0000 | |
|---|---|---|
| committer | 2019-12-16 20:54:32 +0000 | |
| commit | bd0624304e37a5d602740c1eb3a2a717536e03ce (patch) | |
| tree | 32dcbc77c4e38c04ca27edadd5e63c754014c908 /sysprop/sysprop_test.go | |
| parent | 9b1084f9b9db00b4d83e1afd3cd02c19854fcadb (diff) | |
| parent | 7113d20774cd08b03fae4fb990bb15a791440152 (diff) | |
Merge "Use empty string for core image variant"
Diffstat (limited to 'sysprop/sysprop_test.go')
| -rw-r--r-- | sysprop/sysprop_test.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index 81f4c5376..7b906731f 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -295,10 +295,10 @@ func TestSyspropLibrary(t *testing.T) { } for _, variant := range []string{ - "android_arm_armv7-a-neon_core_shared", - "android_arm_armv7-a-neon_core_static", - "android_arm64_armv8-a_core_shared", - "android_arm64_armv8-a_core_static", + "android_arm_armv7-a-neon_shared", + "android_arm_armv7-a-neon_static", + "android_arm64_armv8-a_shared", + "android_arm64_armv8-a_static", } { ctx.ModuleForTests("libsysprop-platform", variant) @@ -310,17 +310,17 @@ func TestSyspropLibrary(t *testing.T) { ctx.ModuleForTests("sysprop-vendor", "android_common") // Check for exported includes - coreVariant := "android_arm64_armv8-a_core_static" + coreVariant := "android_arm64_armv8-a_static" vendorVariant := "android_arm64_armv8-a_vendor.VER_static" - platformInternalPath := "libsysprop-platform/android_arm64_armv8-a_core_static/gen/sysprop/include" - platformPublicCorePath := "libsysprop-platform/android_arm64_armv8-a_core_static/gen/sysprop/public/include" + 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_arm64_armv8-a_vendor.VER_static/gen/sysprop/public/include" - platformOnProductPath := "libsysprop-platform-on-product/android_arm64_armv8-a_core_static/gen/sysprop/public/include" + platformOnProductPath := "libsysprop-platform-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include" vendorInternalPath := "libsysprop-vendor/android_arm64_armv8-a_vendor.VER_static/gen/sysprop/include" - vendorPublicPath := "libsysprop-vendor/android_arm64_armv8-a_core_static/gen/sysprop/public/include" + vendorPublicPath := "libsysprop-vendor/android_arm64_armv8-a_static/gen/sysprop/public/include" platformClient := ctx.ModuleForTests("cc-client-platform", coreVariant) platformFlags := platformClient.Rule("cc").Args["cFlags"] |