StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Filter out headers generated by bazel in snapshot." am: 6715377e58

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2186395

Change-Id: Ie24a8e1b6732a8015789b280b8dfceab5c288d42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Liu
2022-08-15 21:39:18 +00:00
committed by Automerger Merge Worker
parent aa40195d60 6715377e58
commit dea2c72b02
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/library.go
View File

@@ -771,6 +771,12 @@ func GlobHeadersForSnapshot(ctx android.ModuleContext, paths android.Paths) andr
if strings.HasPrefix(dir, android.PathForOutput(ctx).String()) { if strings.HasPrefix(dir, android.PathForOutput(ctx).String()) {
continue continue
} }
// Filter out the generated headers from bazel.
if strings.HasPrefix(dir, android.PathForBazelOut(ctx, "bazel-out").String()) {
continue
}
// libeigen wrongly exports the root directory "external/eigen". But only two // libeigen wrongly exports the root directory "external/eigen". But only two
// subdirectories "Eigen" and "unsupported" contain exported header files. Even worse // subdirectories "Eigen" and "unsupported" contain exported header files. Even worse
// some of them have no extension. So we need special treatment for libeigen in order // some of them have no extension. So we need special treatment for libeigen in order