diff options
| author | 2021-04-27 05:54:20 +0000 | |
|---|---|---|
| committer | 2021-04-27 06:26:40 +0000 | |
| commit | 882bcc1c1cf4af1c3712c7d9c4fea315a8a8d08d (patch) | |
| tree | d329e5a283a614a188fea9b6e7e1feb7574ef946 /cc/library.go | |
| parent | c30d7beb8f4d479f8141130287279f17f53abd23 (diff) | |
bp2build: remove header globs in generated srcs.
Not needed anymore for bp2build-incremental since https://android-review.googlesource.com/q/topic:no-include-check.
Not needed for mixed builds either, since cc compile actions aren't sandboxed.
Fixes: 186488830
Test: treehugger and go tests
Change-Id: Ib5d4908dcce6bf910a653c457bb251d726e717d4
Diffstat (limited to 'cc/library.go')
| -rw-r--r-- | cc/library.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cc/library.go b/cc/library.go index af92b24b7..f49698e7a 100644 --- a/cc/library.go +++ b/cc/library.go @@ -259,11 +259,10 @@ func CcLibraryBp2Build(ctx android.TopDownMutatorContext) { compilerAttrs := bp2BuildParseCompilerProps(ctx, m) linkerAttrs := bp2BuildParseLinkerProps(ctx, m) - exportedIncludes, exportedIncludesHeaders := bp2BuildParseExportedIncludes(ctx, m) + exportedIncludes := bp2BuildParseExportedIncludes(ctx, m) attrs := &bazelCcLibraryAttributes{ Srcs: compilerAttrs.srcs, - Hdrs: exportedIncludesHeaders, Copts: compilerAttrs.copts, Linkopts: linkerAttrs.linkopts, Deps: linkerAttrs.deps, @@ -2176,7 +2175,7 @@ func CcLibraryStaticBp2Build(ctx android.TopDownMutatorContext) { compilerAttrs := bp2BuildParseCompilerProps(ctx, module) linkerAttrs := bp2BuildParseLinkerProps(ctx, module) - exportedIncludes, exportedIncludesHeaders := bp2BuildParseExportedIncludes(ctx, module) + exportedIncludes := bp2BuildParseExportedIncludes(ctx, module) attrs := &bazelCcLibraryStaticAttributes{ Copts: compilerAttrs.copts, @@ -2184,7 +2183,6 @@ func CcLibraryStaticBp2Build(ctx android.TopDownMutatorContext) { Deps: linkerAttrs.deps, Linkstatic: true, Includes: exportedIncludes, - Hdrs: exportedIncludesHeaders, } props := bazel.BazelTargetModuleProperties{ |