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

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

Merge "Tidy up the definition of sdkCore."

parents 8f9782f5 880f964f

java/sdk.go

+6 −1
Original line number Diff line number Diff line
@@ -449,7 +449,12 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep 
	case sdkTest:

		return toModule([]string{"android_test_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx))

	case sdkCore:

		return toModule([]string{"core.current.stubs"}, "", nil)

		return sdkDep{

			useModule:        true,

			bootclasspath:    []string{"core.current.stubs", config.DefaultLambdaStubsLibrary},

			systemModules:    "core-current-stubs-system-modules",

			noFrameworksLibs: true,

		}

	case sdkModule:

		// TODO(146757305): provide .apk and .aidl that have more APIs for modules

		return toModule([]string{"android_module_lib_stubs_current"}, "framework-res", nonUpdatableFrameworkAidlPath(ctx))

java/sdk_test.go

+4 −5
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ func TestClasspath(t *testing.T) { 
			properties:    `sdk_version: "core_current",`,

			bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"},

			system:        "core-current-stubs-system-modules",

			java9classpath: []string{"core.current.stubs"},

		},

		{