From ba88c4127463108cdbccd7e3c38407daef6c6b23 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Sun, 21 Oct 2018 22:57:26 +0100 Subject: [PATCH] Use correct system_modules with core.current.stubs The system_modules defn used with core.current.stubs was core-system-modules which doesn't match. Instead, this change uses core-current-stubs-system-modules. Test: build Change-Id: Ifb9e77b02bbb04c1cb39c6b9f97932c20d44d8ba --- java/sdk.go | 2 +- java/testing.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/java/sdk.go b/java/sdk.go index e93f8fb69..506edfb51 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -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" } diff --git a/java/testing.go b/java/testing.go index fc7842dd2..e1b06a075 100644 --- a/java/testing.go +++ b/java/testing.go @@ -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",