Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b407131a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I7bc54dc4,I4e9bfebd 

* changes:
  java_sdk_library: Correct stubs source generation classpath
  Fix definition of android_stubs_current in sdk tests
parents 6e2fb5c0 7b78b4d4

java/sdk_library.go

+6 −8
Original line number Diff line number Diff line
@@ -498,17 +498,15 @@ func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiSc 
		}

	}{}



	sdkDep := decodeSdkDep(mctx, sdkContext(&module.Library))

	// Use the platform API if standard libraries were requested, otherwise use

	// no default libraries.

	sdkVersion := ""

	if !sdkDep.hasStandardLibs() {

		sdkVersion = "none"

	}

	// The stubs source processing uses the same compile time classpath when extracting the

	// API from the implementation library as it does when compiling it. i.e. the same

	// * sdk version

	// * system_modules

	// * libs (static_libs/libs)



	props.Name = proptools.StringPtr(module.docsName(apiScope))

	props.Srcs = append(props.Srcs, module.Library.Module.properties.Srcs...)

	props.Sdk_version = proptools.StringPtr(sdkVersion)

	props.Sdk_version = module.Library.Module.deviceProperties.Sdk_version

	props.System_modules = module.Library.Module.deviceProperties.System_modules

	props.Installable = proptools.BoolPtr(false)

	// A droiddoc module has only one Libs property and doesn't distinguish between

sdk/java_sdk_test.go

+3 −3
Original line number Diff line number Diff line
@@ -46,13 +46,13 @@ java_system_modules_import { 
java_import {

	name: "core.platform.api.stubs",

}

java_sdk_library_import {

java_import {

	name: "android_stubs_current",

}

java_sdk_library_import {

java_import {

	name: "android_system_stubs_current",

}

java_sdk_library_import {

java_import {

	name: "android_test_stubs_current",

}

java_import {