diff options
| author | Inseob Kim <inseob@google.com> | 2019-08-26 16:52:35 +0900 |
|---|---|---|
| committer | Inseob Kim <inseob@google.com> | 2019-09-18 10:53:30 +0900 |
| commit | 64c439538699e753031a631ad517557cdf10494b (patch) | |
| tree | cda5b46faffaaf3f8ec299f4886feaf5d0b028b3 /sysprop | |
| parent | f7e6870f81ee252102542ce9bb89181f84b2a768 (diff) | |
| download | build_soong-64c439538699e753031a631ad517557cdf10494b.tar.gz build_soong-64c439538699e753031a631ad517557cdf10494b.tar.bz2 build_soong-64c439538699e753031a631ad517557cdf10494b.zip | |
Add version to vendor variants
Vendor variant is now divided into several vendor.{version} variants,
depending on their intended usages:
vendor.{BOARD_VNDK_VERSION}: vendor and vendor_available modules
vendor.{PLATFORM_VNDK_VERSION}: VNDK modules in the source tree
vendor.{snapshot_ver}: VNDK snapshot modules
This also affects exported module names from Soong to Make. But to
maintain backward compatibility, ".{BOARD_VNDK_VERSION}" suffix will not
be emitted for modules having version BOARD_VNDK_VERSION, so that vendor
modules still can be referred as-is.
Bug: 65377115
Bug: 68123344
Test: clean build and boot blueline
Change-Id: Ib9016a0f1fe06b97e9423fd95142653a89a343fa
Diffstat (limited to 'sysprop')
| -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 5345770a..8db68339 100644 --- a/sysprop/sysprop_test.go +++ b/sysprop/sysprop_test.go @@ -282,10 +282,10 @@ func TestSyspropLibrary(t *testing.T) { // Check for generated cc_library for _, variant := range []string{ - "android_arm_armv7-a-neon_vendor_shared", - "android_arm_armv7-a-neon_vendor_static", - "android_arm64_armv8-a_vendor_shared", - "android_arm64_armv8-a_vendor_static", + "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", } { ctx.ModuleForTests("libsysprop-platform", variant) ctx.ModuleForTests("libsysprop-vendor", variant) @@ -309,15 +309,15 @@ func TestSyspropLibrary(t *testing.T) { // Check for exported includes coreVariant := "android_arm64_armv8-a_core_static" - vendorVariant := "android_arm64_armv8-a_vendor_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" - platformPublicVendorPath := "libsysprop-platform/android_arm64_armv8-a_vendor_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" - vendorInternalPath := "libsysprop-vendor/android_arm64_armv8-a_vendor_static/gen/sysprop/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" platformClient := ctx.ModuleForTests("cc-client-platform", coreVariant) |