tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge ""module_current" and "system_server_current" should contain ART's @SystemApi(MODULE_LIBRARIES)" am: 39924233e0 am: 472603d46f

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

Change-Id: I7c699d6a1b6f7a4f093ca953dab5f161b377093d
This commit is contained in:
Orion Hodson 2021-07-01 10:08:12 +00:00 committed by Automerger Merge Worker
commit 7be1ef9502
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
java/sdk.go
View file

@ -175,10 +175,24 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext)
} }
case android.SdkModule: case android.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 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)),
}
case android.SdkSystemServer: case android.SdkSystemServer:
// 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_system_server_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx)) 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)),
}
default: default:
panic(fmt.Errorf("invalid sdk %q", sdkVersion.Raw)) panic(fmt.Errorf("invalid sdk %q", sdkVersion.Raw))
} }

4
java/sdk_test.go
View file

@ -219,7 +219,7 @@ func TestClasspath(t *testing.T) {
name: "module_current", name: "module_current",
properties: `sdk_version: "module_current",`, properties: `sdk_version: "module_current",`,
bootclasspath: []string{"android_module_lib_stubs_current", "core-lambda-stubs"}, bootclasspath: []string{"android_module_lib_stubs_current", "core-lambda-stubs"},
system: "core-current-stubs-system-modules", system: "core-module-lib-stubs-system-modules",
java9classpath: []string{"android_module_lib_stubs_current"}, java9classpath: []string{"android_module_lib_stubs_current"},
aidl: "-pout/soong/framework_non_updatable.aidl", aidl: "-pout/soong/framework_non_updatable.aidl",
}, },
@ -227,7 +227,7 @@ func TestClasspath(t *testing.T) {
name: "system_server_current", name: "system_server_current",
properties: `sdk_version: "system_server_current",`, properties: `sdk_version: "system_server_current",`,
bootclasspath: []string{"android_system_server_stubs_current", "core-lambda-stubs"}, bootclasspath: []string{"android_system_server_stubs_current", "core-lambda-stubs"},
system: "core-current-stubs-system-modules", system: "core-module-lib-stubs-system-modules",
java9classpath: []string{"android_system_server_stubs_current"}, java9classpath: []string{"android_system_server_stubs_current"},
aidl: "-pout/soong/framework.aidl", aidl: "-pout/soong/framework.aidl",
}, },

1
java/testing.go
View file

@ -312,6 +312,7 @@ func gatherRequiredDepsForTest() string {
systemModules := []string{ systemModules := []string{
"core-current-stubs-system-modules", "core-current-stubs-system-modules",
"core-module-lib-stubs-system-modules",
"legacy-core-platform-api-stubs-system-modules", "legacy-core-platform-api-stubs-system-modules",
"stable-core-platform-api-stubs-system-modules", "stable-core-platform-api-stubs-system-modules",
} }