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

Commit 9de51af7 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Rename core-current-stubs-system-modules to be more consistent"

parents c37663aa 10fb76f4

java/core-libraries/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ java_library { 


// Used when compiling higher-level code against core.current.stubs.

java_system_modules {

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

    name: "core-public-stubs-system-modules",

    visibility: ["//visibility:public"],

    libs: [

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

java/sdk.go

+4 −4
Original line number Diff line number Diff line
@@ -186,16 +186,16 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) 
			noFrameworksLibs: true,

		}

	case android.SdkPublic:

		return toModule("core-current-stubs-system-modules", "android_stubs_current", sdkFrameworkAidlPath(ctx))

		return toModule("core-public-stubs-system-modules", "android_stubs_current", sdkFrameworkAidlPath(ctx))

	case android.SdkSystem:

		return toModule("core-current-stubs-system-modules", "android_system_stubs_current", sdkFrameworkAidlPath(ctx))

		return toModule("core-public-stubs-system-modules", "android_system_stubs_current", sdkFrameworkAidlPath(ctx))

	case android.SdkTest:

		return toModule("core-current-stubs-system-modules", "android_test_stubs_current", sdkFrameworkAidlPath(ctx))

		return toModule("core-public-stubs-system-modules", "android_test_stubs_current", sdkFrameworkAidlPath(ctx))

	case android.SdkCore:

		return sdkDep{

			useModule:        true,

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

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

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

			noFrameworksLibs: true,

		}

	case android.SdkModule:

java/sdk_test.go

+4 −4
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ func TestClasspath(t *testing.T) { 
			name:           "current",

			properties:     `sdk_version: "current",`,

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

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

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

			java9classpath: []string{"android_stubs_current"},

			aidl:           "-pout/soong/framework.aidl",

		},
@@ -129,7 +129,7 @@ func TestClasspath(t *testing.T) { 
			name:           "system_current",

			properties:     `sdk_version: "system_current",`,

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

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

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

			java9classpath: []string{"android_system_stubs_current"},

			aidl:           "-pout/soong/framework.aidl",

		},
@@ -169,7 +169,7 @@ func TestClasspath(t *testing.T) { 
			name:           "test_current",

			properties:     `sdk_version: "test_current",`,

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

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

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

			java9classpath: []string{"android_test_stubs_current"},

			aidl:           "-pout/soong/framework.aidl",

		},
@@ -201,7 +201,7 @@ func TestClasspath(t *testing.T) { 
			name:          "core_current",

			properties:    `sdk_version: "core_current",`,

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

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

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

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=true.

java/testing.go

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ func gatherRequiredDepsForTest() string { 
		}`



	systemModules := []string{

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

		"core-public-stubs-system-modules",

		"core-module-lib-stubs-system-modules",

		"legacy-core-platform-api-stubs-system-modules",

		"stable-core-platform-api-stubs-system-modules",