diff options
| author | 2021-05-06 16:33:52 +0100 | |
|---|---|---|
| committer | 2021-05-06 23:13:06 +0100 | |
| commit | 525a59056552a66cb82a621507eb5ac90c96f9f7 (patch) | |
| tree | f9e9966927dafae63a138b9c7b0b15bd2fd80de8 /sdk/cc_sdk_test.go | |
| parent | b6b89a40741fbc9a043f3dcc348f111b000de1a7 (diff) | |
Make sdk tests more realistic
The tests use <sdk>_<module>_<version> as the format for a versioned
sdk member name but the format should be <sdk>_<module>@<version>. This
change corrects it and also fixes a similar issue in an error message.
Bug: 181569894
Test: m nothing
Change-Id: I8be0db4bcd0b6f4d6fbdf9e402ef7257fae8e18b
Diffstat (limited to 'sdk/cc_sdk_test.go')
| -rw-r--r-- | sdk/cc_sdk_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index a4f985b8d..31555c02e 100644 --- a/sdk/cc_sdk_test.go +++ b/sdk/cc_sdk_test.go @@ -191,12 +191,12 @@ func TestBasicSdkWithCc(t *testing.T) { sdk_snapshot { name: "mysdk@1", - native_shared_libs: ["sdkmember_mysdk_1"], + native_shared_libs: ["sdkmember_mysdk@1"], } sdk_snapshot { name: "mysdk@2", - native_shared_libs: ["sdkmember_mysdk_2"], + native_shared_libs: ["sdkmember_mysdk@2"], } cc_prebuilt_library_shared { @@ -208,7 +208,7 @@ func TestBasicSdkWithCc(t *testing.T) { } cc_prebuilt_library_shared { - name: "sdkmember_mysdk_1", + name: "sdkmember_mysdk@1", sdk_member_name: "sdkmember", srcs: ["libfoo.so"], system_shared_libs: [], @@ -221,7 +221,7 @@ func TestBasicSdkWithCc(t *testing.T) { } cc_prebuilt_library_shared { - name: "sdkmember_mysdk_2", + name: "sdkmember_mysdk@2", sdk_member_name: "sdkmember", srcs: ["libfoo.so"], system_shared_libs: [], @@ -272,8 +272,8 @@ func TestBasicSdkWithCc(t *testing.T) { } `) - sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk_1", "android_arm64_armv8-a_shared_apex10000_mysdk_1").Rule("toc").Output - sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk_2", "android_arm64_armv8-a_shared_apex10000_mysdk_2").Rule("toc").Output + sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk@1", "android_arm64_armv8-a_shared_apex10000_mysdk_1").Rule("toc").Output + sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk@2", "android_arm64_armv8-a_shared_apex10000_mysdk_2").Rule("toc").Output cpplibForMyApex := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_1") cpplibForMyApex2 := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_2") |