drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I58502249,I6db85a44

Browse Source 
* changes:
  Merge system and module-lib APIs from conscrypt and i18n
  Merge annotations zip from conscrypt and i18n
This commit is contained in:
Paul Duffin 2022-01-28 16:12:09 +00:00 committed by Gerrit Code Review
commit 4d6002c204
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/api.go
View File

@ -27,7 +27,6 @@ import (
const art = "art.module.public.api" const art = "art.module.public.api"
const conscrypt = "conscrypt.module.public.api" const conscrypt = "conscrypt.module.public.api"
const i18n = "i18n.module.public.api" const i18n = "i18n.module.public.api"
var modules_with_only_public_scope = []string{i18n, conscrypt}
// The intention behind this soong plugin is to generate a number of "merged" // The intention behind this soong plugin is to generate a number of "merged"
// API-related modules that would otherwise require a large amount of very // API-related modules that would otherwise require a large amount of very
@ -149,8 +148,6 @@ func createMergedStubsSrcjar(ctx android.LoadHookContext, modules []string) {
// This produces the same annotations.zip as framework-doc-stubs, but by using // This produces the same annotations.zip as framework-doc-stubs, but by using
// outputs from individual modules instead of all the source code. // outputs from individual modules instead of all the source code.
func createMergedAnnotations(ctx android.LoadHookContext, modules []string) { func createMergedAnnotations(ctx android.LoadHookContext, modules []string) {
// Conscrypt and i18n currently do not enable annotations
modules = removeAll(modules, []string{conscrypt, i18n})
props := genruleProps{} props := genruleProps{}
props.Name = proptools.StringPtr("sdk-annotations.zip") props.Name = proptools.StringPtr("sdk-annotations.zip")
props.Tools = []string{"merge_annotation_zips", "soong_zip"} props.Tools = []string{"merge_annotation_zips", "soong_zip"}
@ -195,11 +192,8 @@ func createMergedPublicStubs(ctx android.LoadHookContext, modules []string) {
func createMergedSystemStubs(ctx android.LoadHookContext, modules []string) { func createMergedSystemStubs(ctx android.LoadHookContext, modules []string) {
props := libraryProps{} props := libraryProps{}
modules_with_system_stubs := removeAll(modules, modules_with_only_public_scope)
props.Name = proptools.StringPtr("all-modules-system-stubs") props.Name = proptools.StringPtr("all-modules-system-stubs")
props.Static_libs = append( props.Static_libs = transformArray(modules, "", ".stubs.system")
transformArray(modules_with_only_public_scope, "", ".stubs"),
transformArray(modules_with_system_stubs, "", ".stubs.system")...)
props.Sdk_version = proptools.StringPtr("module_current") props.Sdk_version = proptools.StringPtr("module_current")
props.Visibility = []string{"//frameworks/base"} props.Visibility = []string{"//frameworks/base"}
ctx.CreateModule(java.LibraryFactory, &props) ctx.CreateModule(java.LibraryFactory, &props)
@ -226,8 +220,6 @@ func createPublicStubsSourceFilegroup(ctx android.LoadHookContext, modules []str
func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_classpath []string) { func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_classpath []string) {
var textFiles []MergedTxtDefinition var textFiles []MergedTxtDefinition
// Two module libraries currently do not support @SystemApi so only have the public scope.
bcpWithSystemApi := removeAll(bootclasspath, modules_with_only_public_scope)
tagSuffix := []string{".api.txt}", ".removed-api.txt}"} tagSuffix := []string{".api.txt}", ".removed-api.txt}"}
for i, f := range []string{"current.txt", "removed.txt"} { for i, f := range []string{"current.txt", "removed.txt"} {
@ -241,14 +233,14 @@ func createMergedTxts(ctx android.LoadHookContext, bootclasspath, system_server_
textFiles = append(textFiles, MergedTxtDefinition{ textFiles = append(textFiles, MergedTxtDefinition{
TxtFilename: f, TxtFilename: f,
BaseTxt: ":non-updatable-system-" + f, BaseTxt: ":non-updatable-system-" + f,
Modules: bcpWithSystemApi, Modules: bootclasspath,
ModuleTag: "{.system" + tagSuffix[i], ModuleTag: "{.system" + tagSuffix[i],
Scope: "system", Scope: "system",
}) })
textFiles = append(textFiles, MergedTxtDefinition{ textFiles = append(textFiles, MergedTxtDefinition{
TxtFilename: f, TxtFilename: f,
BaseTxt: ":non-updatable-module-lib-" + f, BaseTxt: ":non-updatable-module-lib-" + f,
Modules: bcpWithSystemApi, Modules: bootclasspath,
ModuleTag: "{.module-lib" + tagSuffix[i], ModuleTag: "{.module-lib" + tagSuffix[i],
Scope: "module-lib", Scope: "module-lib",
}) })