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

Merge "java_sdk_library - replace .docs suffix with .stubs.source" am: 19d84a0f3e am: 233c3d4978

Browse Source 
Change-Id: I181a8336d7fa0ed861c251e82464e9d398c8a8f1
This commit is contained in:
Automerger Merge Worker
2020-02-12 02:58:53 +00:00
parent 5a14677e31 233c3d4978
commit cdf68cd043
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java_test.go
View File

@@ -1112,9 +1112,9 @@ func TestJavaSdkLibrary(t *testing.T) {
ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix, "android_common")
ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix+sdkSystemApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix+sdkSystemApiSuffix, "android_common")
ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix+sdkTestApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsLibrarySuffix+sdkTestApiSuffix, "android_common")
ctx.ModuleForTests("foo"+sdkDocsSuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsSourceSuffix, "android_common")
ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkSystemApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsSourceSuffix+sdkSystemApiSuffix, "android_common")
ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkTestApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkStubsSourceSuffix+sdkTestApiSuffix, "android_common")
ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_arm64_armv8-a") ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_arm64_armv8-a")
ctx.ModuleForTests("foo.api.public.28", "") ctx.ModuleForTests("foo.api.public.28", "")
ctx.ModuleForTests("foo.api.system.28", "") ctx.ModuleForTests("foo.api.system.28", "")

4
java/sdk_library.go
View File

@@ -34,7 +34,7 @@ const (
sdkStubsLibrarySuffix = ".stubs" sdkStubsLibrarySuffix = ".stubs"
sdkSystemApiSuffix = ".system" sdkSystemApiSuffix = ".system"
sdkTestApiSuffix = ".test" sdkTestApiSuffix = ".test"
sdkDocsSuffix = ".docs" sdkStubsSourceSuffix = ".stubs.source"
sdkXmlFileSuffix = ".xml" sdkXmlFileSuffix = ".xml"
permissionsTemplate = `<?xml version="1.0" encoding="utf-8"?>\n` + permissionsTemplate = `<?xml version="1.0" encoding="utf-8"?>\n` +
`<!-- Copyright (C) 2018 The Android Open Source Project\n` + `<!-- Copyright (C) 2018 The Android Open Source Project\n` +
@@ -109,7 +109,7 @@ func (scope *apiScope) stubsModuleName(baseName string) string {
} }
func (scope *apiScope) docsModuleName(baseName string) string { func (scope *apiScope) docsModuleName(baseName string) string {
return baseName + sdkDocsSuffix + scope.moduleSuffix return baseName + sdkStubsSourceSuffix + scope.moduleSuffix
} }
type apiScopes []*apiScope type apiScopes []*apiScope