StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sdk tests more realistic

Browse Source 
The tests use <sdk>_<module>_<version> as the format for a versioned
sdk member name but the format should be <sdk>_<module>@<version>. This
change corrects it and also fixes a similar issue in an error message.

Bug: 181569894
Test: m nothing
Change-Id: I8be0db4bcd0b6f4d6fbdf9e402ef7257fae8e18b
This commit is contained in:
Paul Duffin
2021-05-06 16:33:52 +01:00
parent b6b89a4074
commit 525a590565
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/java_sdk_test.go
View File

@@ -83,12 +83,12 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) {
sdk_snapshot {
name: "mysdk@1",
java_header_libs: ["sdkmember_mysdk_1"],
java_header_libs: ["sdkmember_mysdk@1"],
}
sdk_snapshot {
name: "mysdk@2",
java_header_libs: ["sdkmember_mysdk_2"],
java_header_libs: ["sdkmember_mysdk@2"],
}
java_library {
@@ -100,13 +100,13 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) {
}
java_import {
name: "sdkmember_mysdk_1",
name: "sdkmember_mysdk@1",
sdk_member_name: "sdkmember",
host_supported: true,
}
java_import {
name: "sdkmember_mysdk_2",
name: "sdkmember_mysdk@2",
sdk_member_name: "sdkmember",
host_supported: true,
}
@@ -144,8 +144,8 @@ func TestBasicSdkWithJavaLibrary(t *testing.T) {
}
`)
sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk_1", "android_common").Rule("combineJar").Output
sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk_2", "android_common").Rule("combineJar").Output
sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk@1", "android_common").Rule("combineJar").Output
sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk@2", "android_common").Rule("combineJar").Output
javalibForMyApex := result.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_1")
javalibForMyApex2 := result.ModuleForTests("myjavalib", "android_common_apex10000_mysdk_2")