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

Commit 1f41dbff authored by Pete Gillin's avatar Pete Gillin
Browse files

Split the core/platform API into stable and legacy versions. 

For now, everything outside libcore still uses the legacy version.

Test: treehugger
Bug: 157640067
Change-Id: If5234e9ee533ff537926801a0af045d36b1caf01
parent 8a624337

java/config/config.go

+3 −2
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ import ( 
var (

	pctx = android.NewPackageContext("android/soong/java/config")



	DefaultBootclasspathLibraries = []string{"core.platform.api.stubs", "core-lambda-stubs"}

	DefaultSystemModules          = "core-platform-api-stubs-system-modules"

	// TODO(b/157640067): Don't depend on the legacy API by default in the long term.

	DefaultBootclasspathLibraries = []string{"legacy.core.platform.api.stubs", "core-lambda-stubs"}

	DefaultSystemModules          = "legacy-core-platform-api-stubs-system-modules"

	DefaultLibraries              = []string{"ext", "framework"}

	DefaultLambdaStubsLibrary     = "core-lambda-stubs"

	SdkLambdaStubsPath            = "prebuilts/sdk/tools/core-lambda-stubs.jar"

java/hiddenapi_singleton.go

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ func stubFlagsRule(ctx android.SingletonContext) { 


	// Core Platform API stubs

	corePlatformStubModules := []string{

		"core.platform.api.stubs",

		"legacy.core.platform.api.stubs",

	}



	// Allow products to define their own stubs for custom product jars that apps can use.

java/java.go

+3 −2
Original line number Diff line number Diff line
@@ -837,8 +837,9 @@ type linkTypeContext interface { 


func (m *Module) getLinkType(name string) (ret linkType, stubs bool) {

	switch name {

	case "core.current.stubs", "core.platform.api.stubs", "stub-annotations",

		"private-stub-annotations-jar", "core-lambda-stubs", "core-generated-annotation-stubs":

	case "core.current.stubs", "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs",

		"stub-annotations", "private-stub-annotations-jar",

		"core-lambda-stubs", "core-generated-annotation-stubs":

		return javaCore, true

	case "android_stubs_current":

		return javaSdk, true

java/sdk_test.go

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



			name:           "nostdlib system_modules",

			properties:     `sdk_version: "none", system_modules: "core-platform-api-stubs-system-modules"`,

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

			bootclasspath:  []string{"core-platform-api-stubs-system-modules-lib"},

			properties:     `sdk_version: "none", system_modules: "legacy-core-platform-api-stubs-system-modules"`,

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

			bootclasspath:  []string{"legacy-core-platform-api-stubs-system-modules-lib"},

			java8classpath: []string{},

		},

		{

java/testing.go

+10 −9
Original line number Diff line number Diff line
@@ -173,7 +173,8 @@ func GatherRequiredDepsForTest() string { 
		"android_module_lib_stubs_current",

		"android_system_server_stubs_current",

		"core.current.stubs",

		"core.platform.api.stubs",

		"legacy.core.platform.api.stubs",

		"stable.core.platform.api.stubs",

		"kotlin-stdlib",

		"kotlin-stdlib-jdk7",

		"kotlin-stdlib-jdk8",
@@ -186,7 +187,7 @@ func GatherRequiredDepsForTest() string { 
				name: "%s",

				srcs: ["a.java"],

				sdk_version: "none",

				system_modules: "core-platform-api-stubs-system-modules",

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

			}

		`, extra)

	}
@@ -196,7 +197,7 @@ func GatherRequiredDepsForTest() string { 
			name: "framework",

			srcs: ["a.java"],

			sdk_version: "none",

			system_modules: "core-platform-api-stubs-system-modules",

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

			aidl: {

				export_include_dirs: ["framework/aidl"],

			},
@@ -211,7 +212,7 @@ func GatherRequiredDepsForTest() string { 
			name: "android.hidl.base-V1.0-java",

			srcs: ["a.java"],

			sdk_version: "none",

			system_modules: "core-platform-api-stubs-system-modules",

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

			installable: true,

		}
@@ -219,7 +220,7 @@ func GatherRequiredDepsForTest() string { 
			name: "android.hidl.manager-V1.0-java",

			srcs: ["a.java"],

			sdk_version: "none",

			system_modules: "core-platform-api-stubs-system-modules",

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

			installable: true,

		}
@@ -227,7 +228,7 @@ func GatherRequiredDepsForTest() string { 
			name: "org.apache.http.legacy",

			srcs: ["a.java"],

			sdk_version: "none",

			system_modules: "core-platform-api-stubs-system-modules",

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

			installable: true,

		}
@@ -235,7 +236,7 @@ func GatherRequiredDepsForTest() string { 
			name: "android.test.base",

			srcs: ["a.java"],

			sdk_version: "none",

			system_modules: "core-platform-api-stubs-system-modules",

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

			installable: true,

		}
@@ -243,14 +244,14 @@ func GatherRequiredDepsForTest() string { 
			name: "android.test.mock",

			srcs: ["a.java"],

			sdk_version: "none",

			system_modules: "core-platform-api-stubs-system-modules",

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

			installable: true,

		}

	`



	systemModules := []string{

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

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

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

	}



	for _, extra := range systemModules {