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

Commit 880f964f authored by Pete Gillin's avatar Pete Gillin
Browse files

Tidy up the definition of sdkCore. 

Compared to the effect of the toModule function, this (a) sets
noFrameworkLibs to true, which seems logically correct, and (b) stops
setting java9Classpath, which was redundant since the same stubs are
available in 1.9+ builds via the systemModules setting. (This brings
sdkCore into line with sdkCorePlatform in both cases.)

Test: m art.module.api.annotations
Change-Id: I61a868bc363a3bf174725b78c0a1657021cfe08a
parent 7b0bdce6

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"},

		},

		{