diff options
| -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 e8858230ba4e..b31a26c90789 100644 --- a/api/api.go +++ b/api/api.go @@ -131,11 +131,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 { @@ -241,6 +242,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) } @@ -250,6 +252,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) } @@ -262,6 +265,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 @@ -273,6 +277,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) } } @@ -286,6 +291,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 @@ -297,6 +303,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) } } @@ -307,6 +314,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) } @@ -316,6 +324,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) } @@ -359,6 +368,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) } @@ -372,6 +382,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) } @@ -472,6 +483,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) } @@ -493,6 +505,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) } |