diff options
| author | 2022-12-02 17:31:58 -0500 | |
|---|---|---|
| committer | 2022-12-13 14:32:19 -0500 | |
| commit | eddd3c0ba4135dde8bedede3bfc1ae8c00a5af80 (patch) | |
| tree | f998c10e71f525261822f6ee9f6f8c20a8711e89 /cc | |
| parent | b545f49f067ba5aaf274f56f225bc851b6fa6d03 (diff) | |
add APEX transitive dependency validation
Bug: 218419109
Test: b build //packages/modules/adb/apex:com.android.adbd
Change-Id: I93b0c99d6521e419e52c63271646448f6d708c22
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/library_headers.go | 7 | ||||
| -rw-r--r-- | cc/object.go | 7 | ||||
| -rw-r--r-- | cc/proto.go | 4 |
3 files changed, 15 insertions, 3 deletions
diff --git a/cc/library_headers.go b/cc/library_headers.go index 1c4f35403..4d38068fd 100644 --- a/cc/library_headers.go +++ b/cc/library_headers.go @@ -145,7 +145,12 @@ func libraryHeadersBp2Build(ctx android.TopDownMutatorContext, module *Module) { Bzl_load_location: "//build/bazel/rules/cc:cc_library_headers.bzl", } - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs) + tags := android.ApexAvailableTags(module) + + ctx.CreateBazelTargetModule(props, android.CommonAttributes{ + Name: module.Name(), + Tags: tags, + }, attrs) } // Append .contribution suffix to input labels diff --git a/cc/object.go b/cc/object.go index 1a96b7205..ce9bb084a 100644 --- a/cc/object.go +++ b/cc/object.go @@ -208,7 +208,12 @@ func objectBp2Build(ctx android.TopDownMutatorContext, m *Module) { Bzl_load_location: "//build/bazel/rules/cc:cc_object.bzl", } - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, attrs) + tags := android.ApexAvailableTags(m) + + ctx.CreateBazelTargetModule(props, android.CommonAttributes{ + Name: m.Name(), + Tags: tags, + }, attrs) } func (object *objectLinker) appendLdflags(flags []string) { diff --git a/cc/proto.go b/cc/proto.go index 27f37cbbd..97470e5ea 100644 --- a/cc/proto.go +++ b/cc/proto.go @@ -165,7 +165,8 @@ func protoFlags(ctx ModuleContext, flags Flags, p *android.ProtoProperties) Flag } type protoAttributes struct { - Deps bazel.LabelListAttribute + Deps bazel.LabelListAttribute + Min_sdk_version *string } type bp2buildProtoDeps struct { @@ -203,6 +204,7 @@ func bp2buildProto(ctx android.Bp2buildMutatorContext, m *Module, protoSrcs baze var protoAttrs protoAttributes protoAttrs.Deps.SetValue(protoInfo.Proto_libs) + protoAttrs.Min_sdk_version = m.Properties.Min_sdk_version name := m.Name() + suffix tags := android.ApexAvailableTags(m) |