diff options
| author | 2022-05-20 13:59:19 +0000 | |
|---|---|---|
| committer | 2022-05-20 13:59:19 +0000 | |
| commit | e73d52cb9b1e2785cd2b1a8093fc5b313e91892f (patch) | |
| tree | 250f56dfcc148a4eeb5b19446d4b640e81d5d58a /sdk/java_sdk_test.go | |
| parent | cf5161be7cd4f0c88b5c9e8afe51f4b503cebc32 (diff) | |
| parent | 958806b8c846a5c37830721d82e2d2adb9e7dc16 (diff) | |
Merge "Add custom java_sdk_library info to the SDK info file"
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index 9d0c3deb9..f33aa268e 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -651,7 +651,19 @@ module_exports_snapshot { } func TestSnapshotWithJavaSystemModules(t *testing.T) { - result := android.GroupFixturePreparers(prepareForSdkTestWithJavaSdkLibrary).RunTestWithBp(t, ` + result := android.GroupFixturePreparers( + prepareForSdkTestWithJava, + java.PrepareForTestWithJavaDefaultModules, + java.PrepareForTestWithJavaSdkLibraryFiles, + java.FixtureWithPrebuiltApisAndExtensions(map[string][]string{ + "31": {"myjavalib"}, + "32": {"myjavalib"}, + "current": {"myjavalib"}, + }, map[string][]string{ + "1": {"myjavalib"}, + "2": {"myjavalib"}, + }), + ).RunTestWithBp(t, ` sdk { name: "mysdk", java_header_libs: ["exported-system-module"], @@ -796,7 +808,7 @@ sdk_snapshot { .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt .intermediates/myjavalib.stubs.source/android_common/metalava/myjavalib.stubs.source_removed.txt -> sdk_library/public/myjavalib-removed.txt `), - checkInfoContents(` + checkInfoContents(result.Config, ` [ { "@type": "sdk", @@ -826,7 +838,16 @@ sdk_snapshot { }, { "@type": "java_sdk_library", - "@name": "myjavalib" + "@name": "myjavalib", + "dist_stem": "myjavalib", + "scopes": { + "public": { + "current_api": "sdk_library/public/myjavalib.txt", + "latest_api": "out/soong/.intermediates/prebuilts/sdk/myjavalib.api.public.latest/gen/myjavalib.api.public.latest", + "latest_removed_api": "out/soong/.intermediates/prebuilts/sdk/myjavalib-removed.api.public.latest/gen/myjavalib-removed.api.public.latest", + "removed_api": "sdk_library/public/myjavalib-removed.txt" + } + } }, { "@type": "java_library", |