diff options
author | 2020-08-18 17:19:40 +0000 | |
---|---|---|
committer | 2020-08-18 17:19:40 +0000 | |
commit | fc4d79598cbcb96f37338e99859de7c33955018d (patch) | |
tree | 29ff153e3893b70c9043f44e7ed068f1b6bb5918 /sdk/java_sdk_test.go | |
parent | ff6752dfbc7db0bbcaaf5ada7c8ec1d760f7bf32 (diff) | |
parent | 0c7b26e0e24c82fa0642a7d68fb4f5c791c923f8 (diff) |
Merge "Revert "Deduplicate APEX variants that would build identically""
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()) |