diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-04-09 00:10:17 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2020-04-09 01:32:38 +0100 |
| commit | 3d1248ceb6d8c1ce7d2f3f2e62f98700f668e4dc (patch) | |
| tree | 4144300c9832ea1857f7b174c0d138d35f0ce4dd /sdk/java_sdk_test.go | |
| parent | bbb546b2da4c99525cdbe5f782c7102ae10bb386 (diff) | |
Export stub sources as part of the java_sdk_library
Minor refactoring of checkMergeZip(string) -> checkMergeZips(...string)
to allow testing of multiple merge zips.
Bug: 153443117
Test: m nothing
Change-Id: I8db00f611ced15f8476ba16f2834a72e8c913596
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index bce2ab390..0bac49f78 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -624,7 +624,7 @@ module_exports_snapshot { `), checkAllCopyRules(""), - checkMergeZip(".intermediates/myexports/common_os/tmp/java/myjavaapistubs_stubs_sources.zip"), + checkMergeZips(".intermediates/myexports/common_os/tmp/java/myjavaapistubs_stubs_sources.zip"), ) } @@ -678,7 +678,7 @@ module_exports_snapshot { } `), checkAllCopyRules(""), - checkMergeZip(".intermediates/myexports/common_os/tmp/java/myjavaapistubs_stubs_sources.zip"), + checkMergeZips(".intermediates/myexports/common_os/tmp/java/myjavaapistubs_stubs_sources.zip"), ) } @@ -997,14 +997,17 @@ java_sdk_library_import { apex_available: ["//apex_available:anyapex"], public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], sdk_version: "current", }, system: { jars: ["sdk_library/system/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], sdk_version: "system_current", }, test: { jars: ["sdk_library/test/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/test/myjavalib_stub_sources"], sdk_version: "test_current", }, } @@ -1015,14 +1018,17 @@ java_sdk_library_import { apex_available: ["//apex_available:anyapex"], public: { jars: ["sdk_library/public/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/public/myjavalib_stub_sources"], sdk_version: "current", }, system: { jars: ["sdk_library/system/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/system/myjavalib_stub_sources"], sdk_version: "system_current", }, test: { jars: ["sdk_library/test/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/test/myjavalib_stub_sources"], sdk_version: "test_current", }, } @@ -1037,5 +1043,9 @@ sdk_snapshot { .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 `), + checkMergeZips( + ".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip", + ".intermediates/mysdk/common_os/tmp/sdk_library/system/myjavalib_stub_sources.zip", + ".intermediates/mysdk/common_os/tmp/sdk_library/test/myjavalib_stub_sources.zip"), ) } |