openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Make sdk tests more realistic" am: e0fc8725f3 am: bef3a5ce3e 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1699186

Change-Id: I899ecb12c2d87598befccdb2a98b8047ffec7fe3
This commit is contained in:
Paul Duffin 2021-05-07 12:44:01 +00:00 committed by Automerger Merge Worker
parent 33334e65b7 bef3a5ce3e
commit 7b8d04b3b8
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/sdk.go
View File

@ -82,7 +82,7 @@ const SdkVersionSeparator = '@'
func ParseSdkRef(ctx BaseModuleContext, str string, property string) SdkRef { func ParseSdkRef(ctx BaseModuleContext, str string, property string) SdkRef {
tokens := strings.Split(str, string(SdkVersionSeparator)) tokens := strings.Split(str, string(SdkVersionSeparator))
if len(tokens) < 1 || len(tokens) > 2 { if len(tokens) < 1 || len(tokens) > 2 {
ctx.PropertyErrorf(property, "%q does not follow name#version syntax", str) ctx.PropertyErrorf(property, "%q does not follow name@version syntax", str)
return SdkRef{Name: "invalid sdk name", Version: "invalid sdk version"} return SdkRef{Name: "invalid sdk name", Version: "invalid sdk version"}
} }

12
sdk/cc_sdk_test.go
View File

@ -191,12 +191,12 @@ func TestBasicSdkWithCc(t *testing.T) {
sdk_snapshot { sdk_snapshot {
name: "mysdk@1", name: "mysdk@1",
native_shared_libs: ["sdkmember_mysdk_1"], native_shared_libs: ["sdkmember_mysdk@1"],
} }
sdk_snapshot { sdk_snapshot {
name: "mysdk@2", name: "mysdk@2",
native_shared_libs: ["sdkmember_mysdk_2"], native_shared_libs: ["sdkmember_mysdk@2"],
} }
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
@ -208,7 +208,7 @@ func TestBasicSdkWithCc(t *testing.T) {
} }
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "sdkmember_mysdk_1", name: "sdkmember_mysdk@1",
sdk_member_name: "sdkmember", sdk_member_name: "sdkmember",
srcs: ["libfoo.so"], srcs: ["libfoo.so"],
system_shared_libs: [], system_shared_libs: [],
@ -221,7 +221,7 @@ func TestBasicSdkWithCc(t *testing.T) {
} }
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "sdkmember_mysdk_2", name: "sdkmember_mysdk@2",
sdk_member_name: "sdkmember", sdk_member_name: "sdkmember",
srcs: ["libfoo.so"], srcs: ["libfoo.so"],
system_shared_libs: [], system_shared_libs: [],
@ -272,8 +272,8 @@ func TestBasicSdkWithCc(t *testing.T) {
} }
`) `)
sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk_1", "android_arm64_armv8-a_shared_apex10000_mysdk_1").Rule("toc").Output sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk@1", "android_arm64_armv8-a_shared_apex10000_mysdk_1").Rule("toc").Output
sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk_2", "android_arm64_armv8-a_shared_apex10000_mysdk_2").Rule("toc").Output sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk@2", "android_arm64_armv8-a_shared_apex10000_mysdk_2").Rule("toc").Output
cpplibForMyApex := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_1") cpplibForMyApex := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_1")
cpplibForMyApex2 := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_2") cpplibForMyApex2 := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_2")

12
sdk/java_sdk_test.go
View File

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