-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make AndroidTests pass with incompatible_disallow_empty_glob
There are several globs that are empty and this prevents building with the incompatible flag #8195. This commit just makes it explicit that empty is allowed. Closes #15374. PiperOrigin-RevId: 477730831 Change-Id: I7063906f8eca5db4653fb126f4b781dec2c035cd
- Loading branch information
1 parent
fe5bb70
commit 6c78ed8
Showing
5 changed files
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...com/google/devtools/build/lib/bazel/rules/android/android_ndk_misc_libraries_template.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
cc_library( | ||
name = "cpufeatures", | ||
srcs = glob(["ndk/sources/android/cpufeatures/*.c"]), | ||
hdrs = glob(["ndk/sources/android/cpufeatures/*.h"]), | ||
srcs = glob(["ndk/sources/android/cpufeatures/*.c"], allow_empty = True), | ||
hdrs = glob(["ndk/sources/android/cpufeatures/*.h"], allow_empty = True), | ||
linkopts = ["-ldl"], | ||
) |
2 changes: 1 addition & 1 deletion
2
.../com/google/devtools/build/lib/bazel/rules/android/android_ndk_stl_filegroup_template.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
filegroup( | ||
name = "%name%", | ||
srcs = glob(["%fileGlobPattern%"]), | ||
srcs = glob(["%fileGlobPattern%"], allow_empty = True), | ||
) |
2 changes: 1 addition & 1 deletion
2
.../devtools/build/lib/bazel/rules/android/android_ndk_vulkan_validation_layers_template.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
cc_library( | ||
name = "vulkan_validation_layers_%toolchainName%", | ||
srcs = glob(["ndk/sources/third_party/vulkan/src/build-android/jniLibs/%cpu%/libVkLayer_*.so"]), | ||
srcs = glob(["ndk/sources/third_party/vulkan/src/build-android/jniLibs/%cpu%/libVkLayer_*.so"], allow_empty = True), | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters