java_sdk_library: Preserve sdk_version: "none" in snapshot
Test: m nothing
Bug: 156354511
Merged-In: Icf7c20dc109a773430768c1a2d91c674551dbc1b
Change-Id: Icf7c20dc109a773430768c1a2d91c674551dbc1b
(cherry picked from commit 780c5f4715d402b4faddef336d456e39cfae9db1)
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 8956e8b..68690c0 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -567,7 +567,7 @@
}
// Get the sdk version for use when compiling the stubs library.
-func (module *SdkLibrary) sdkVersionForStubsLibrary(mctx android.DefaultableHookContext, apiScope *apiScope) string {
+func (module *SdkLibrary) sdkVersionForStubsLibrary(mctx android.EarlyModuleContext, apiScope *apiScope) string {
sdkDep := decodeSdkDep(mctx, sdkContext(&module.Library))
if sdkDep.hasStandardLibs() {
// If building against a standard sdk then use the sdk version appropriate for the scope.
@@ -1443,7 +1443,7 @@
if len(jars) > 0 {
properties := scopeProperties{}
properties.Jars = jars
- properties.SdkVersion = apiScope.sdkVersion
+ properties.SdkVersion = sdk.sdkVersionForStubsLibrary(ctx.SdkModuleContext(), apiScope)
properties.StubsSrcJar = paths.stubsSrcJar
properties.CurrentApiFile = paths.currentApiFilePath
properties.RemovedApiFile = paths.removedApiFilePath