From 0c7b26e0e24c82fa0642a7d68fb4f5c791c923f8 Mon Sep 17 00:00:00 2001 From: Pete Bentley Date: Tue, 18 Aug 2020 13:44:59 +0000 Subject: Revert "Deduplicate APEX variants that would build identically" This reverts commit d6b2525b003b5620b3745a79dce56093173504f5. Reason for revert: Change-Id: I7cb68cb87522415004390c0672dc774e0067b122 --- sdk/java_sdk_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sdk/java_sdk_test.go') 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()) -- cgit v1.2.3-59-g8ed1b