Add bazel_module properties to cc_defaults

Test: go soong tests
Test: add bazel_module to Android.bp file and m nothing
Change-Id: I13c3e8d59536dbea88f3495309f4f64e849ede9f
This commit is contained in:
Liz Kammer 2021-03-31 15:42:03 -04:00
parent 51a0d85ebc
commit 3cf5211890
2 changed files with 9 additions and 0 deletions

View File

@ -3284,6 +3284,10 @@ func (c *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext,
type Defaults struct {
android.ModuleBase
android.DefaultsModuleBase
// Included to support setting bazel_module.label for multiple Soong modules to the same Bazel
// target. This is primarily useful for modules that were architecture specific and instead are
// handled in Bazel as a select().
android.BazelModuleBase
android.ApexModuleBase
}
@ -3330,6 +3334,8 @@ func DefaultsFactory(props ...interface{}) android.Module {
&RustBindgenClangProperties{},
)
// Bazel module must be initialized _before_ Defaults to be included in cc_defaults module.
android.InitBazelModule(module)
android.InitDefaultsModule(module)
return module

View File

@ -3368,6 +3368,9 @@ func TestDefaults(t *testing.T) {
shared: {
srcs: ["baz.c"],
},
bazel_module: {
bp2build_available: true,
},
}
cc_library_static {