diff options
| author | 2020-08-18 05:07:22 +0000 | |
|---|---|---|
| committer | 2020-08-18 05:07:22 +0000 | |
| commit | aa3235edcc79f76bb66f5bcad3a47c8c60b64ec3 (patch) | |
| tree | e91b202cf5f10ae8af7a82d3b30a283769816442 /sdk/cc_sdk_test.go | |
| parent | b8b19daf9ddcb0f884e68e82cb5849d617a3c21c (diff) | |
| parent | ca29a25d38b6fcd4845720404f56fb8d8726e246 (diff) | |
Merge "Deduplicate APEX variants that would build identically" am: ca29a25d38
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1399832
Change-Id: Ic3727a541bb7a098fe81ca0d4cf92e2139f1a7ab
Diffstat (limited to 'sdk/cc_sdk_test.go')
| -rw-r--r-- | sdk/cc_sdk_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go index 9501d88d7..b8ffc11c4 100644 --- a/sdk/cc_sdk_test.go +++ b/sdk/cc_sdk_test.go @@ -265,11 +265,11 @@ func TestBasicSdkWithCc(t *testing.T) { } `) - sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk_1", "android_arm64_armv8-a_shared_myapex").Rule("toc").Output - sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk_2", "android_arm64_armv8-a_shared_myapex2").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_myapex") - cpplibForMyApex2 := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_myapex2") + cpplibForMyApex := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_1") + cpplibForMyApex2 := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_2") // Depending on the uses_sdks value, different libs are linked ensureListContains(t, pathsToStrings(cpplibForMyApex.Rule("ld").Implicits), sdkMemberV1.String()) |