StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tidy up the definition of sdkCore." am: 759ccc13af

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

Change-Id: Ib7493194d3a67968cb7db55642fe00fda9e72e52
This commit is contained in:
Treehugger Robot
2020-07-06 12:57:15 +00:00
committed by Automerger Merge Worker
parent 3e3626bbc1 759ccc13af
commit 6f69e3a2db
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/sdk.go
View File

@@ -449,7 +449,12 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep
case sdkTest: case sdkTest:
return toModule([]string{"android_test_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx)) return toModule([]string{"android_test_stubs_current"}, "framework-res", sdkFrameworkAidlPath(ctx))
case sdkCore: case sdkCore:
return toModule([]string{"core.current.stubs"}, "", nil) return sdkDep{
useModule: true,
bootclasspath: []string{"core.current.stubs", config.DefaultLambdaStubsLibrary},
systemModules: "core-current-stubs-system-modules",
noFrameworksLibs: true,
}
case sdkModule: case 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 toModule([]string{"android_module_lib_stubs_current"}, "framework-res", nonUpdatableFrameworkAidlPath(ctx))

9
java/sdk_test.go
View File

@@ -139,11 +139,10 @@ func TestClasspath(t *testing.T) {
}, },
{ {
name: "core_current", name: "core_current",
properties: `sdk_version: "core_current",`, properties: `sdk_version: "core_current",`,
bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"}, bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"},
system: "core-current-stubs-system-modules", system: "core-current-stubs-system-modules",
java9classpath: []string{"core.current.stubs"},
}, },
{ {