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

Support java_sdk_library as member of sdk

Browse Source 
Bug: 153443117
Test: m nothing
Change-Id: I9d8089b2555038e3f10ad5939a6a7b01839c67ea
This commit is contained in:
Paul Duffin
2020-02-10 13:37:10 +00:00
parent 46a26a8871
commit dd46f71493
3 changed files with 203 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
sdk/java_sdk_test.go
View File

@@ -24,7 +24,51 @@ func testSdkWithJava(t *testing.T, bp string) *testSdkResult {
fs := map[string][]byte{
"Test.java": nil,
"aidl/foo/bar/Test.aidl": nil,
// For java_sdk_library
"api/current.txt": nil,
"api/removed.txt": nil,
"api/system-current.txt": nil,
"api/system-removed.txt": nil,
"api/test-current.txt": nil,
"api/test-removed.txt": nil,
"build/soong/scripts/gen-java-current-api-files.sh": nil,
}
// for java_sdk_library tests
bp = `
java_system_modules_import {
name: "core-current-stubs-system-modules",
}
java_system_modules_import {
name: "core-platform-api-stubs-system-modules",
}
java_import {
name: "core.platform.api.stubs",
}
java_sdk_library_import {
name: "android_stubs_current",
}
java_sdk_library_import {
name: "android_system_stubs_current",
}
java_sdk_library_import {
name: "android_test_stubs_current",
}
java_import {
name: "core-lambda-stubs",
sdk_version: "none",
}
java_import {
name: "ext",
sdk_version: "none",
}
java_import {
name: "framework",
sdk_version: "none",
}
` + bp
return testSdkWithFs(t, bp, fs)
}
@@ -927,3 +971,71 @@ module_exports_snapshot {
`),
)
}
func TestSnapshotWithJavaSdkLibrary(t *testing.T) {
result := testSdkWithJava(t, `
sdk {
name: "mysdk",
java_sdk_libs: ["myjavalib"],
}
java_sdk_library {
name: "myjavalib",
apex_available: ["//apex_available:anyapex"],
srcs: ["Test.java"],
sdk_version: "current",
}
`)
result.CheckSnapshot("mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
java_sdk_library_import {
name: "mysdk_myjavalib@current",
sdk_member_name: "myjavalib",
apex_available: ["//apex_available:anyapex"],
public: {
jars: ["sdk_library/public/myjavalib-stubs.jar"],
sdk_version: "current",
},
system: {
jars: ["sdk_library/system/myjavalib-stubs.jar"],
sdk_version: "system_current",
},
test: {
jars: ["sdk_library/test/myjavalib-stubs.jar"],
sdk_version: "test_current",
},
}
java_sdk_library_import {
name: "myjavalib",
prefer: false,
apex_available: ["//apex_available:anyapex"],
public: {
jars: ["sdk_library/public/myjavalib-stubs.jar"],
sdk_version: "current",
},
system: {
jars: ["sdk_library/system/myjavalib-stubs.jar"],
sdk_version: "system_current",
},
test: {
jars: ["sdk_library/test/myjavalib-stubs.jar"],
sdk_version: "test_current",
},
}
sdk_snapshot {
name: "mysdk@current",
java_sdk_libs: ["mysdk_myjavalib@current"],
}
`),
checkAllCopyRules(`
.intermediates/myjavalib.stubs/android_common/javac/myjavalib.stubs.jar -> sdk_library/public/myjavalib-stubs.jar
.intermediates/myjavalib.stubs.system/android_common/javac/myjavalib.stubs.system.jar -> sdk_library/system/myjavalib-stubs.jar
.intermediates/myjavalib.stubs.test/android_common/javac/myjavalib.stubs.test.jar -> sdk_library/test/myjavalib-stubs.jar
`),
)
}