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

Commit e9758b04 authored by Paul Duffin's avatar Paul Duffin
Browse files

Use toModule for all "standard" API surfaces 

For the purposes of this change a standard API surface is one of the
following:
* public
* system
* test
* module-lib
* system-server

Test: m droid
Bug: 204189791
Change-Id: I88ee9709430ca455dd6c7d1523ae22f8c22b0b7e
parent 132c3e61

java/sdk.go

+10 −24
Original line number Diff line number Diff line
@@ -116,13 +116,13 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) 
		}

	}



	toModule := func(modules []string, res string, aidl android.Path) sdkDep {

	toModule := func(systemModules string, module string, aidl android.Path) sdkDep {

		return sdkDep{

			useModule:          true,

			bootclasspath:      append(modules, config.DefaultLambdaStubsLibrary),

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

			java9Classpath:     modules,

			frameworkResModule: res,

			bootclasspath:      []string{module, config.DefaultLambdaStubsLibrary},

			systemModules:      systemModules,

			java9Classpath:     []string{module},

			frameworkResModule: "framework-res",

			aidl:               android.OptionalPathForPath(aidl),

		}

	}
@@ -161,11 +161,11 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) 
			noFrameworksLibs: true,

		}

	case android.SdkPublic:

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

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

	case android.SdkSystem:

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

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

	case android.SdkTest:

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

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

	case android.SdkCore:

		return sdkDep{

			useModule:        true,
@@ -175,24 +175,10 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext) 
		}

	case android.SdkModule:

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

		return sdkDep{

			useModule:          true,

			bootclasspath:      []string{"android_module_lib_stubs_current", config.DefaultLambdaStubsLibrary},

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

			java9Classpath:     []string{"android_module_lib_stubs_current"},

			frameworkResModule: "framework-res",

			aidl:               android.OptionalPathForPath(nonUpdatableFrameworkAidlPath(ctx)),

		}

		return toModule("core-module-lib-stubs-system-modules", "android_module_lib_stubs_current", nonUpdatableFrameworkAidlPath(ctx))

	case android.SdkSystemServer:

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

		return sdkDep{

			useModule:          true,

			bootclasspath:      []string{"android_system_server_stubs_current", config.DefaultLambdaStubsLibrary},

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

			java9Classpath:     []string{"android_system_server_stubs_current"},

			frameworkResModule: "framework-res",

			aidl:               android.OptionalPathForPath(sdkFrameworkAidlPath(ctx)),

		}

		return toModule("core-module-lib-stubs-system-modules", "android_system_server_stubs_current", sdkFrameworkAidlPath(ctx))

	default:

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

	}