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

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
commit c9d38ec5e0
2 changed files with 2 additions and 1 deletions

View file

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

View file

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