diff options
author | Jihoon Kang <jihoonkang@google.com> | 2024-02-12 23:18:52 +0000 |
---|---|---|
committer | Jihoon Kang <jihoonkang@google.com> | 2024-02-14 17:39:01 +0000 |
commit | a7073b50971868c0d1d96ac03cf21b2e96eaac74 (patch) | |
tree | b9f3c7ef4857a189de6f7ba2adb2e56c2c74e5e3 /api | |
parent | a73a8b3a9e4d9112db4790e3c760fa56e489f229 (diff) | |
download | base-a7073b50971868c0d1d96ac03cf21b2e96eaac74.tar.gz |
Set is_stubs_module for stubs modules
This change sets is_stubs_module property to true for combined modules
genreated in `combined_apis` and non-updatable stub modules, which are
not generated via java_sdk_library but are maintained separately.
Test: m nothing --no-skip-soong-tests
Bug: 310504781
Merged-In: I1293208e575a76db2cc4dc6c8564369804bb4ac5
Change-Id: I1293208e575a76db2cc4dc6c8564369804bb4ac5
Diffstat (limited to 'api')
-rw-r--r-- | api/StubLibraries.bp | 4 | ||||
-rw-r--r-- | api/api.go | 23 |
2 files changed, 22 insertions, 5 deletions
diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp index 852abdfdf602..2edbd9138f6e 100644 --- a/api/StubLibraries.bp +++ b/api/StubLibraries.bp @@ -225,6 +225,7 @@ java_defaults { java_version: "1.8", compile_dex: true, visibility: ["//visibility:public"], + is_stubs_module: true, } java_defaults { @@ -233,6 +234,7 @@ java_defaults { system_modules: "none", java_version: "1.8", compile_dex: true, + is_stubs_module: true, } java_defaults { @@ -716,6 +718,7 @@ java_library { // with its own package-private android.annotation.Nullable. "private-stub-annotations-jar", ], + is_stubs_module: true, } java_genrule { @@ -770,6 +773,7 @@ java_defaults { // annotations found, thus should exist inside android.jar. "private-stub-annotations-jar", ], + is_stubs_module: true, } // Listing of API domains contribution and dependencies per API surfaces diff --git a/api/api.go b/api/api.go index fa2be21db09f..3632fa891df9 100644 --- a/api/api.go +++ b/api/api.go @@ -93,11 +93,12 @@ type genruleProps struct { } type libraryProps struct { - Name *string - Sdk_version *string - Static_libs []string - Visibility []string - Defaults []string + Name *string + Sdk_version *string + Static_libs []string + Visibility []string + Defaults []string + Is_stubs_module *bool } type fgProps struct { @@ -201,6 +202,7 @@ func createMergedPublicStubs(ctx android.LoadHookContext, modules []string) { props.Static_libs = transformArray(modules, "", ".stubs") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } @@ -210,6 +212,7 @@ func createMergedPublicExportableStubs(ctx android.LoadHookContext, modules []st props.Static_libs = transformArray(modules, "", ".stubs.exportable") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } @@ -222,6 +225,7 @@ func createMergedSystemStubs(ctx android.LoadHookContext, modules []string) { props.Static_libs = transformArray(updatable_modules, "", ".stubs.system") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } // Now merge all-updatable-modules-system-stubs and stubs from non-updatable modules @@ -233,6 +237,7 @@ func createMergedSystemStubs(ctx android.LoadHookContext, modules []string) { props.Static_libs = append(props.Static_libs, "all-updatable-modules-system-stubs") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } } @@ -246,6 +251,7 @@ func createMergedSystemExportableStubs(ctx android.LoadHookContext, modules []st props.Static_libs = transformArray(updatable_modules, "", ".stubs.exportable.system") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } // Now merge all-updatable-modules-system-stubs and stubs from non-updatable modules @@ -257,6 +263,7 @@ func createMergedSystemExportableStubs(ctx android.LoadHookContext, modules []st props.Static_libs = append(props.Static_libs, "all-updatable-modules-system-stubs-exportable") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } } @@ -267,6 +274,7 @@ func createMergedTestStubsForNonUpdatableModules(ctx android.LoadHookContext) { props.Static_libs = transformArray(non_updatable_modules, "", ".stubs.test") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } @@ -276,6 +284,7 @@ func createMergedTestExportableStubsForNonUpdatableModules(ctx android.LoadHookC props.Static_libs = transformArray(non_updatable_modules, "", ".stubs.exportable.test") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } @@ -319,6 +328,7 @@ func createMergedFrameworkModuleLibExportableStubs(ctx android.LoadHookContext, props.Static_libs = transformArray(modules, "", ".stubs.exportable.module_lib") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } @@ -332,6 +342,7 @@ func createMergedFrameworkModuleLibStubs(ctx android.LoadHookContext, modules [] props.Static_libs = transformArray(modules, "", ".stubs.module_lib") props.Sdk_version = proptools.StringPtr("module_current") props.Visibility = []string{"//frameworks/base"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } @@ -432,6 +443,7 @@ func createFullApiLibraries(ctx android.LoadHookContext) { props.Static_libs = []string{staticLib} props.Defaults = []string{"android.jar_defaults"} props.Visibility = []string{"//visibility:public"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } @@ -453,6 +465,7 @@ func createFullExportableApiLibraries(ctx android.LoadHookContext) { props.Static_libs = []string{staticLib} props.Defaults = []string{"android.jar_defaults"} props.Visibility = []string{"//visibility:public"} + props.Is_stubs_module = proptools.BoolPtr(true) ctx.CreateModule(java.LibraryFactory, &props) } |