diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-05-12 11:50:28 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2020-05-13 18:07:09 +0100 |
| commit | 080f5ee6f2b5c35e589fb6140be1fecd213be346 (patch) | |
| tree | 0d4307a69b5736c3514b16515465a7ee93939970 /sdk | |
| parent | 1f4ad0e44d6f18c2f0a686f94f945be3230d5551 (diff) | |
| download | build_soong-080f5ee6f2b5c35e589fb6140be1fecd213be346.tar.gz build_soong-080f5ee6f2b5c35e589fb6140be1fecd213be346.tar.bz2 build_soong-080f5ee6f2b5c35e589fb6140be1fecd213be346.zip | |
java_sdk_library: Add sdk_version for API scopes
Allow the sdk_version against which the stubs for a scope are compiled
to be specified in the module on a per scope basis.
Bug: 155164730
Test: m nothing
Merged-In: I5881e5ee7c2169c30f544882344a60a602dae917
Change-Id: I5881e5ee7c2169c30f544882344a60a602dae917
(cherry picked from commit 87a05a389d9edfa3b83d90aa4c08cb66a29e4caf)
Diffstat (limited to 'sdk')
| -rw-r--r-- | sdk/java_sdk_test.go | 64 |
1 files changed, 63 insertions, 1 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index acacd97e..436fd9d2 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -1134,7 +1134,69 @@ sdk_snapshot { ) } -func TestSnapshotWithJavaSdkLibrary_ApiSurfaces(t *testing.T) { +func TestSnapshotWithJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) { + result := testSdkWithJava(t, ` + sdk { + name: "mysdk", + java_sdk_libs: ["myjavalib"], + } + + java_sdk_library { + name: "myjavalib", + srcs: ["Test.java"], + sdk_version: "module_current", + public: { + enabled: true, + sdk_version: "module_current", + }, + } + `) + + result.CheckSnapshot("mysdk", "", + checkAndroidBpContents(` +// This is auto-generated. DO NOT EDIT. + +java_sdk_library_import { + name: "mysdk_myjavalib@current", + sdk_member_name: "myjavalib", + public: { + jars: ["sdk_library/public/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + current_api: "sdk_library/public/myjavalib.txt", + removed_api: "sdk_library/public/myjavalib-removed.txt", + sdk_version: "module_current", + }, +} + +java_sdk_library_import { + name: "myjavalib", + prefer: false, + public: { + jars: ["sdk_library/public/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], + current_api: "sdk_library/public/myjavalib.txt", + removed_api: "sdk_library/public/myjavalib-removed.txt", + sdk_version: "module_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.source/android_common/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib.txt +.intermediates/myjavalib.stubs.source/android_common/myjavalib.stubs.source_api.txt -> sdk_library/public/myjavalib-removed.txt +`), + checkMergeZips( + ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", + ), + ) +} + +func TestSnapshotWithJavaSdkLibrary_ApiScopes(t *testing.T) { result := testSdkWithJava(t, ` sdk { name: "mysdk", |