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

Merge "Rename core-current-stubs-system-modules to be more consistent" am: 9de51af72c am: 9cf5708c2c am: e7087fd0b4

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

Change-Id: I8df9a0b898353dcd0875df97d98b18cb1e3e8a92
This commit is contained in:
Paul Duffin
2021-11-03 19:32:49 +00:00
committed by Automerger Merge Worker
parent fbc04ca616 e7087fd0b4
commit f975b088aa
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/core-libraries/Android.bp
View File

@@ -86,7 +86,7 @@ java_library {
// Used when compiling higher-level code against core.current.stubs. // Used when compiling higher-level code against core.current.stubs.
java_system_modules { java_system_modules {
name: "core-current-stubs-system-modules", name: "core-public-stubs-system-modules",
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
libs: [ libs: [
"core-current-stubs-for-system-modules", "core-current-stubs-for-system-modules",

8
java/sdk.go
View File

@@ -186,16 +186,16 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext)
noFrameworksLibs: true, noFrameworksLibs: true,
} }
case android.SdkPublic: 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: 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: 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: case android.SdkCore:
return sdkDep{ return sdkDep{
useModule: true, useModule: true,
bootclasspath: []string{"core.current.stubs", config.DefaultLambdaStubsLibrary}, bootclasspath: []string{"core.current.stubs", config.DefaultLambdaStubsLibrary},
systemModules: "core-current-stubs-system-modules", systemModules: "core-public-stubs-system-modules",
noFrameworksLibs: true, noFrameworksLibs: true,
} }
case android.SdkModule: case android.SdkModule:

8
java/sdk_test.go
View File

@@ -106,7 +106,7 @@ func TestClasspath(t *testing.T) {
name: "current", name: "current",
properties: `sdk_version: "current",`, properties: `sdk_version: "current",`,
bootclasspath: []string{"android_stubs_current", "core-lambda-stubs"}, 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"}, java9classpath: []string{"android_stubs_current"},
aidl: "-pout/soong/framework.aidl", aidl: "-pout/soong/framework.aidl",
}, },
@@ -129,7 +129,7 @@ func TestClasspath(t *testing.T) {
name: "system_current", name: "system_current",
properties: `sdk_version: "system_current",`, properties: `sdk_version: "system_current",`,
bootclasspath: []string{"android_system_stubs_current", "core-lambda-stubs"}, 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"}, java9classpath: []string{"android_system_stubs_current"},
aidl: "-pout/soong/framework.aidl", aidl: "-pout/soong/framework.aidl",
}, },
@@ -169,7 +169,7 @@ func TestClasspath(t *testing.T) {
name: "test_current", name: "test_current",
properties: `sdk_version: "test_current",`, properties: `sdk_version: "test_current",`,
bootclasspath: []string{"android_test_stubs_current", "core-lambda-stubs"}, 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"}, java9classpath: []string{"android_test_stubs_current"},
aidl: "-pout/soong/framework.aidl", aidl: "-pout/soong/framework.aidl",
}, },
@@ -201,7 +201,7 @@ 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-public-stubs-system-modules",
}, },
{ {
// Test case only applies when Always_use_prebuilt_sdks=true. // Test case only applies when Always_use_prebuilt_sdks=true.

2
java/testing.go
View File

@@ -344,7 +344,7 @@ func gatherRequiredDepsForTest() string {
}` }`
systemModules := []string{ systemModules := []string{
"core-current-stubs-system-modules", "core-public-stubs-system-modules",
"core-module-lib-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",