diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-05-13 19:19:49 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2020-05-14 00:53:50 +0100 |
| commit | 6b836ba566fc83b8785d901067ad41e177292d37 (patch) | |
| tree | 4ef1bab31d7f74c7065195fd166403dbfda6d569 /sdk/java_sdk_test.go | |
| parent | f9088b03c2b1c3b75656bfba70f0a30f1fbe2000 (diff) | |
Correct module_lib scope name
The module_lib scope should be called module-lib in order to pick up
the latest filegroup. Without it the API lint does not use a baseline
and so reports issues with released and unchangeable APIs.
It is also needed for the correct dist path.
Test: m update-api
Bug: 155164730
Change-Id: I7dbafd7164d5da600ca45c39a7f93a5a40027a1f
Diffstat (limited to 'sdk/java_sdk_test.go')
| -rw-r--r-- | sdk/java_sdk_test.go | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go index f67053fba..bbd638494 100644 --- a/sdk/java_sdk_test.go +++ b/sdk/java_sdk_test.go @@ -1328,10 +1328,10 @@ java_sdk_library_import { sdk_version: "system_current", }, module_lib: { - jars: ["sdk_library/module_lib/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/module_lib/myjavalib_stub_sources"], - current_api: "sdk_library/module_lib/myjavalib.txt", - removed_api: "sdk_library/module_lib/myjavalib-removed.txt", + jars: ["sdk_library/module-lib/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources"], + current_api: "sdk_library/module-lib/myjavalib.txt", + removed_api: "sdk_library/module-lib/myjavalib-removed.txt", sdk_version: "module_current", }, } @@ -1355,10 +1355,10 @@ java_sdk_library_import { sdk_version: "system_current", }, module_lib: { - jars: ["sdk_library/module_lib/myjavalib-stubs.jar"], - stub_srcs: ["sdk_library/module_lib/myjavalib_stub_sources"], - current_api: "sdk_library/module_lib/myjavalib.txt", - removed_api: "sdk_library/module_lib/myjavalib-removed.txt", + jars: ["sdk_library/module-lib/myjavalib-stubs.jar"], + stub_srcs: ["sdk_library/module-lib/myjavalib_stub_sources"], + current_api: "sdk_library/module-lib/myjavalib.txt", + removed_api: "sdk_library/module-lib/myjavalib-removed.txt", sdk_version: "module_current", }, } @@ -1375,14 +1375,14 @@ sdk_snapshot { .intermediates/myjavalib.stubs.system/android_common/javac/myjavalib.stubs.system.jar -> sdk_library/system/myjavalib-stubs.jar .intermediates/myjavalib.stubs.source.system/android_common/myjavalib.stubs.source.system_api.txt -> sdk_library/system/myjavalib.txt .intermediates/myjavalib.stubs.source.system/android_common/myjavalib.stubs.source.system_api.txt -> sdk_library/system/myjavalib-removed.txt -.intermediates/myjavalib.stubs.module_lib/android_common/javac/myjavalib.stubs.module_lib.jar -> sdk_library/module_lib/myjavalib-stubs.jar -.intermediates/myjavalib.api.module_lib/android_common/myjavalib.api.module_lib_api.txt -> sdk_library/module_lib/myjavalib.txt -.intermediates/myjavalib.api.module_lib/android_common/myjavalib.api.module_lib_api.txt -> sdk_library/module_lib/myjavalib-removed.txt +.intermediates/myjavalib.stubs.module_lib/android_common/javac/myjavalib.stubs.module_lib.jar -> sdk_library/module-lib/myjavalib-stubs.jar +.intermediates/myjavalib.api.module_lib/android_common/myjavalib.api.module_lib_api.txt -> sdk_library/module-lib/myjavalib.txt +.intermediates/myjavalib.api.module_lib/android_common/myjavalib.api.module_lib_api.txt -> sdk_library/module-lib/myjavalib-removed.txt `), 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/module_lib/myjavalib_stub_sources.zip", + ".intermediates/mysdk/common_os/tmp/sdk_library/module-lib/myjavalib_stub_sources.zip", ), ) } |