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

Merge "Use correct system_modules with core.current.stubs"

Browse Source 
am: 6d376a0de8

Change-Id: I20ab5aaeb24ee63f8fd7019c4c71a482560c036c
This commit is contained in:
Neil Fuller
2019-06-06 09:14:02 -07:00
committed by android-build-merger
parent c831a0a895 6d376a0de8
commit c9d38ec5e0
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/sdk.go
View File

@@ -151,7 +151,7 @@ func decodeSdkDep(ctx android.BaseContext, sdkContext sdkContext) sdkDep {
} }
if m == "core.current.stubs" { if m == "core.current.stubs" {
ret.systemModules = "core-system-modules" ret.systemModules = "core-current-stubs-system-modules"
} else if m == "core.platform.api.stubs" { } else if m == "core.platform.api.stubs" {
ret.systemModules = "core-platform-api-stubs-system-modules" ret.systemModules = "core-platform-api-stubs-system-modules"
} }

1
java/testing.go
View File

@@ -108,6 +108,7 @@ func GatherRequiredDepsForTest() string {
systemModules := []string{ systemModules := []string{
"core-system-modules", "core-system-modules",
"core-current-stubs-system-modules",
"core-platform-api-stubs-system-modules", "core-platform-api-stubs-system-modules",
"android_stubs_current_system_modules", "android_stubs_current_system_modules",
"android_system_stubs_current_system_modules", "android_system_stubs_current_system_modules",