diff options
| author | 2019-11-20 17:12:35 -0800 | |
|---|---|---|
| committer | 2019-12-17 14:45:11 -0800 | |
| commit | fb0c16e95a559e582911834d4fd7621c012fa831 (patch) | |
| tree | 24d47d6476c4d9c3a387c32b110af5db2c1fefb6 /sysprop/sysprop_test.go | |
| parent | bd0624304e37a5d602740c1eb3a2a717536e03ce (diff) | |
Move imageMutator before archMutator
Run the imageMutator between osMutator and archMutator so that
different arch variants can be set for the different partitions.
Bug: 142286466
Test: m checkbuild
Change-Id: I65d05714b75aa462bf9816da60fdc2deda4de593
Merged-In: I65d05714b75aa462bf9816da60fdc2deda4de593
(cherry picked from commit 9c8f687584986f6e36ebfdbda22c3cc6c21cf02d)
Diffstat (limited to 'sysprop/sysprop_test.go')
| -rw-r--r-- | sysprop/sysprop_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go index 7b906731f..5446bdc06 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -284,10 +284,10 @@ func TestSyspropLibrary(t *testing.T) { // Check for generated cc_library for _, variant := range []string{ - "android_arm_armv7-a-neon_vendor.VER_shared", - "android_arm_armv7-a-neon_vendor.VER_static", - "android_arm64_armv8-a_vendor.VER_shared", - "android_arm64_armv8-a_vendor.VER_static", + "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", } { ctx.ModuleForTests("libsysprop-platform", variant) ctx.ModuleForTests("libsysprop-vendor", variant) @@ -311,15 +311,15 @@ func TestSyspropLibrary(t *testing.T) { // Check for exported includes coreVariant := "android_arm64_armv8-a_static" - vendorVariant := "android_arm64_armv8-a_vendor.VER_static" + vendorVariant := "android_vendor.VER_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_arm64_armv8-a_vendor.VER_static/gen/sysprop/public/include" + platformPublicVendorPath := "libsysprop-platform/android_vendor.VER_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_arm64_armv8-a_vendor.VER_static/gen/sysprop/include" + vendorInternalPath := "libsysprop-vendor/android_vendor.VER_arm64_armv8-a_static/gen/sysprop/include" vendorPublicPath := "libsysprop-vendor/android_arm64_armv8-a_static/gen/sysprop/public/include" platformClient := ctx.ModuleForTests("cc-client-platform", coreVariant) |