summaryrefslogtreecommitdiff
path: root/sdk/java_sdk_test.go
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-08-21 07:21:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-21 07:21:53 +0000
commita3d1c127a2b05c23dc3d3327551f736d8a5d60f8 (patch)
treeaf4b8f3d11125779f2450039ce51b66dbe467978 /sdk/java_sdk_test.go
parent0d1812df60891f52ac61b2d9cecedd526265f1b9 (diff)
parent68bfe074c60f4462fc9360713391dee5cabbc8eb (diff)
Merge "Reland: Deduplicate APEX variants that would build identically" am: 68bfe074c6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1405087 Change-Id: I3839e80972dbc025b504f4593538f589be079389
Diffstat (limited to 'sdk/java_sdk_test.go')
-rw-r--r--sdk/java_sdk_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go
index 931ca3c56..5911c718d 100644
--- a/sdk/java_sdk_test.go
+++ b/sdk/java_sdk_test.go
@@ -207,8 +207,8 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) {
sdkMemberV1 := result.ctx.ModuleForTests("sdkmember_mysdk_1", "android_common").Rule("combineJar").Output
sdkMemberV2 := result.ctx.ModuleForTests("sdkmember_mysdk_2", "android_common").Rule("combineJar").Output
- javalibForMyApex := result.ctx.ModuleForTests("myjavalib", "android_common_myapex")
- javalibForMyApex2 := result.ctx.ModuleForTests("myjavalib", "android_common_myapex2")
+ javalibForMyApex := result.ctx.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_1")
+ javalibForMyApex2 := result.ctx.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_2")
// Depending on the uses_sdks value, different libs are linked
ensureListContains(t, pathsToStrings(javalibForMyApex.Rule("javac").Implicits), sdkMemberV1.String())