diff options
| author | Rupert Shuttleworth <ruperts@google.com> | 2021-04-06 20:06:21 +0000 |
|---|---|---|
| committer | Rupert Shuttleworth <ruperts@google.com> | 2021-04-07 16:05:44 +0000 |
| commit | b815168474b9a906997690b37ab9b3c203613155 (patch) | |
| tree | 4ff9508355716f66ffddeba7cbee4b6e1dc73726 /cc/library_headers.go | |
| parent | 85822e9b5f872601da4a68c8a09c5e9484493e7f (diff) | |
| download | soong-b815168474b9a906997690b37ab9b3c203613155.tar.gz | |
Support arch variations for export_system_include_dirs in cc_library_headers bp2build converter.
Test: Added unit test
Test: bp2build-sync.py write; bazel build //bionic/... works for more cc_library_static targets (in a parent CL)
Change-Id: Ib487216a4bcbc52958ff948722dae347b0d8b606
Diffstat (limited to 'cc/library_headers.go')
| -rw-r--r-- | cc/library_headers.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/library_headers.go b/cc/library_headers.go index 82af16a69..d35748bcb 100644 --- a/cc/library_headers.go +++ b/cc/library_headers.go @@ -64,7 +64,7 @@ func prebuiltLibraryHeaderFactory() android.Module { type bazelCcLibraryHeadersAttributes struct { Copts bazel.StringListAttribute Hdrs bazel.LabelListAttribute - Includes bazel.LabelListAttribute + Includes bazel.StringListAttribute Deps bazel.LabelListAttribute } @@ -95,15 +95,15 @@ func CcLibraryHeadersBp2Build(ctx android.TopDownMutatorContext) { return } - exportedIncludesLabels, exportedIncludesHeadersLabels := bp2BuildParseExportedIncludes(ctx, module) + exportedIncludes, exportedIncludesHeaders := bp2BuildParseExportedIncludes(ctx, module) - headerLibsLabels := bp2BuildParseHeaderLibs(ctx, module) + headerLibs := bp2BuildParseHeaderLibs(ctx, module) attrs := &bazelCcLibraryHeadersAttributes{ Copts: bp2BuildParseCflags(ctx, module), - Includes: exportedIncludesLabels, - Hdrs: exportedIncludesHeadersLabels, - Deps: headerLibsLabels, + Includes: exportedIncludes, + Hdrs: exportedIncludesHeaders, + Deps: headerLibs, } props := bazel.BazelTargetModuleProperties{ |