diff options
| author | 2020-08-18 17:32:22 +0000 | |
|---|---|---|
| committer | 2020-08-18 17:32:22 +0000 | |
| commit | b1d3c4c4d789e4962dd584ed5fa514751ba406e2 (patch) | |
| tree | 29ff153e3893b70c9043f44e7ed068f1b6bb5918 /sdk/java_sdk_test.go | |
| parent | de47113bd0a084a936b982e04b652ca1209d8315 (diff) | |
| parent | fc4d79598cbcb96f37338e99859de7c33955018d (diff) | |
Merge "Revert "Deduplicate APEX variants that would build identically"" am: fc4d79598c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1403647
Change-Id: I5f42f292247599f4f374ecdba31fdb72088de3ad
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 5911c718d..931ca3c56 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_apex10000_mysdk_1") - javalibForMyApex2 := result.ctx.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_2") + javalibForMyApex := result.ctx.ModuleForTests("myjavalib", "android_common_myapex") + javalibForMyApex2 := result.ctx.ModuleForTests("myjavalib", "android_common_myapex2") // Depending on the uses_sdks value, different libs are linked ensureListContains(t, pathsToStrings(javalibForMyApex.Rule("javac").Implicits), sdkMemberV1.String()) |