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

Commit ba6ab2e7 authored by Anton Hansson's avatar Anton Hansson
Browse files

Make system_server stubs consistent with other stubs 

Include the module_api stubs in system_server one instead of
putting both of these jars on the classpath. Also rename it
to be in line with the other stubs.

Bug: 149293194
Test: m
Exempt-From-Owner-Approval: approved internally
Change-Id: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
Merged-In: Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e
(cherry picked from commit bbd78556)
parent 85f227ee

java/java.go

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ func (m *Module) getLinkType(name string) (ret linkType, stubs bool) { 
		return javaModule, true

	case ver.kind == sdkModule:

		return javaModule, false

	case name == "services-stubs":

	case name == "android_system_server_stubs_current":

		return javaSystemServer, true

	case ver.kind == sdkSystemServer:

		return javaSystemServer, false

java/sdk.go

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep 
		return toModule([]string{"android_module_lib_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx))

	case sdkSystemServer:

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

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

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

	default:

		panic(fmt.Errorf("invalid sdk %q", sdkVersion.raw))

	}

java/sdk_test.go

+2 −2
Original line number Diff line number Diff line
@@ -222,9 +222,9 @@ func TestClasspath(t *testing.T) { 
		{

			name:           "system_server_current",

			properties:     `sdk_version: "system_server_current",`,

			bootclasspath:  []string{"android_module_lib_stubs_current", "services-stubs", "core-lambda-stubs"},

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

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

			java9classpath: []string{"android_module_lib_stubs_current", "services-stubs"},

			java9classpath: []string{"android_system_server_stubs_current"},

			aidl:           "-p" + buildDir + "/framework.aidl",

		},

	}

java/testing.go

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ func GatherRequiredDepsForTest() string { 
		"android_system_stubs_current",

		"android_test_stubs_current",

		"android_module_lib_stubs_current",

		"services-stubs",

		"android_system_server_stubs_current",

		"core.current.stubs",

		"core.platform.api.stubs",

		"kotlin-stdlib",