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

Commit 6f69e3a2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Tidy up the definition of sdkCore." am: 759ccc13

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353933

Change-Id: Ib7493194d3a67968cb7db55642fe00fda9e72e52
parents 3e3626bb 759ccc13
Loading
Loading
Loading
Loading
+6 −1
Original line number Original line Diff line number Diff line
@@ -449,7 +449,12 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep
	case sdkTest:
	case sdkTest:
		return toModule([]string{"android_test_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx))
		return toModule([]string{"android_test_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx))
	case sdkCore:
	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:
	case sdkModule:
		// TODO(146757305): provide .apk and .aidl that have more APIs for modules
		// TODO(146757305): provide .apk and .aidl that have more APIs for modules
		return toModule([]string{"android_module_lib_stubs_current"}, "framework-res", nonUpdatableFrameworkAidlPath(ctx))
		return toModule([]string{"android_module_lib_stubs_current"}, "framework-res", nonUpdatableFrameworkAidlPath(ctx))
+4 −5
Original line number Original line Diff line number Diff line
@@ -143,7 +143,6 @@ func TestClasspath(t *testing.T) {
			properties:    `sdk_version: "core_current",`,
			properties:    `sdk_version: "core_current",`,
			bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"},
			bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"},
			system:        "core-current-stubs-system-modules",
			system:        "core-current-stubs-system-modules",
			java9classpath: []string{"core.current.stubs"},
		},
		},
		{
		{