From 91b883d541fd7ca6811153da253b4bb49acda023 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 11 Feb 2020 13:05:28 +0000 Subject: [PATCH] java_sdk_library - replace .docs suffix with .stubs.source Previously, the .docs suffix was used for droidstubs internal modules that generate the stubs source. The name was confusing so this change replaces the suffix with .stubs.source to clarify the purpose of those modules. Bug: 148080325 Test: m droid Change-Id: I9d7a2ab19e4a331b515408912ac8f7e8b0e1b35d --- java/java_test.go | 6 +++--- java/sdk_library.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/java_test.go b/java/java_test.go index 8815c09db..17921ca44 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -1112,9 +1112,9 @@ func TestJavaSdkLibrary(t *testing.T) { ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix+sdkSystemApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix+sdkTestApiSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkDocsSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkSystemApiSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkTestApiSuffix, "android_common") + ctx.ModuleForTests("foo"+sdkStubsSourceSuffix, "android_common") + ctx.ModuleForTests("foo"+sdkStubsSourceSuffix+sdkSystemApiSuffix, "android_common") + ctx.ModuleForTests("foo"+sdkStubsSourceSuffix+sdkTestApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_arm64_armv8-a") ctx.ModuleForTests("foo.api.public.28", "") ctx.ModuleForTests("foo.api.system.28", "") diff --git a/java/sdk_library.go b/java/sdk_library.go index 3c376d079..4f4029aa3 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -34,7 +34,7 @@ const ( sdkStubsLibrarySuffix = ".stubs" sdkSystemApiSuffix = ".system" sdkTestApiSuffix = ".test" - sdkDocsSuffix = ".docs" + sdkStubsSourceSuffix = ".stubs.source" sdkXmlFileSuffix = ".xml" permissionsTemplate = `\n` + `