diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt index 6e6c5c95925233..f49626bcce7ef0 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_cc_toolchain_template.txt @@ -38,9 +38,9 @@ toolchain( filegroup( name = "%toolchainName%-all_files", - srcs = glob(["ndk/toolchains/%toolchainDirectory%/**"]) + glob([ + srcs = glob(["ndk/toolchains/%toolchainDirectory%/**"], allow_empty = True) + glob([ %toolchainFileGlobs% - ]) + [ + ], allow_empty = True) + [ ":%dynamicRuntimeLibs%", ":%staticRuntimeLibs%", ], diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_misc_libraries_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_misc_libraries_template.txt index 7970424a82423d..69a2dde263088a 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_misc_libraries_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_misc_libraries_template.txt @@ -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"], ) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_stl_filegroup_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_stl_filegroup_template.txt index fb536055b84e78..437e5b70895f3e 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_stl_filegroup_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_ndk_stl_filegroup_template.txt @@ -1,4 +1,4 @@ filegroup( name = "%name%", - srcs = glob(["%fileGlobPattern%"]), + srcs = glob(["%fileGlobPattern%"], allow_empty = True), ) diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index c739584014062f..61ded7d5bcfbe5 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -180,7 +180,7 @@ public void testFatApk_androidPlatformsFlag() throws Exception { " proguard_specs = [],", " deps = ['lib', 'native-lib'],", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res/**']))"); + " resource_files = glob(['res/**'], allow_empty = True))"); useConfiguration( "--android_platforms=//java/android/platforms:x86,//java/android/platforms:armeabi-v7a", "--dynamic_mode=off"); @@ -915,7 +915,7 @@ public void testIncrementalDexingUsesDexArchives_binaryDependingOnAliasTarget() "android_library(", " name = 'dep',", " srcs = ['dep.java'],", - " resource_files = glob(['res/**']),", + " resource_files = glob(['res/**'], allow_empty = True),", " manifest = 'AndroidManifest.xml',", ")", "alias(", @@ -1509,7 +1509,7 @@ public void testProGuardExecutableMatchesConfiguration() throws Exception { "java/com/google/devtools/build/jkrunchy/BUILD", "package(default_visibility=['//visibility:public'])", "java_binary(name = 'jkrunchy',", - " srcs = glob(['*.java']),", + " srcs = glob(['*.java'], allow_empty = True),", " main_class = 'com.google.devtools.build.jkrunchy.JKrunchyMain')"); useConfiguration("--proguard_top=//java/com/google/devtools/build/jkrunchy:jkrunchy"); @@ -1779,7 +1779,7 @@ public void omitResourcesInfoProviderFromAndroidBinary_enabled() throws Exceptio "android_binary(", " name = 'myapp',", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res/**/*']),", + " resource_files = glob(['res/**/*'], allow_empty = True),", ")"); assertThat(binary.get(AndroidResourcesInfo.PROVIDER)).isNull(); @@ -1795,7 +1795,7 @@ public void omitResourcesInfoProviderFromAndroidBinary_disabled() throws Excepti "android_binary(", " name = 'myapp',", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res/**/*']),", + " resource_files = glob(['res/**/*'], allow_empty = True),", ")"); assertThat(binary.get(AndroidResourcesInfo.PROVIDER)).isNotNull(); @@ -1855,7 +1855,7 @@ public void testFilterResourcesPseudolocalesPropagated() throws Exception { dir, "bin", "android_binary(name = 'bin',", - " resource_files = glob(['res/**']),", + " resource_files = glob(['res/**'], allow_empty = True),", " resource_configuration_filters = ['en', 'en-rXA', 'ar-rXB'],", " manifest = 'AndroidManifest.xml')"); @@ -1921,18 +1921,18 @@ public void testInheritedRNotInRuntimeJars() throws Exception { dir + "BUILD", "android_library(name = 'sublib',", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res3/**']),", + " resource_files = glob(['res3/**'], allow_empty = True),", " srcs =['sublib.java'],", " )", "android_library(name = 'lib',", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res2/**']),", + " resource_files = glob(['res2/**'], allow_empty = True),", " deps = [':sublib'],", " srcs =['lib.java'],", " )", "android_binary(name = 'bin',", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res/**']),", + " resource_files = glob(['res/**'], allow_empty = True),", " deps = [':lib'],", " srcs =['bin.java'],", " )"); @@ -2036,15 +2036,15 @@ public void testUseRClassGeneratorMultipleDeps() throws Exception { "java/r/android/BUILD", "android_library(name = 'lib1',", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res1/**']),", + " resource_files = glob(['res1/**'], allow_empty = True),", " )", "android_library(name = 'lib2',", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res2/**']),", + " resource_files = glob(['res2/**'], allow_empty = True),", " )", "android_binary(name = 'r',", " manifest = 'AndroidManifest.xml',", - " resource_files = glob(['res/**']),", + " resource_files = glob(['res/**'], allow_empty = True),", " deps = [':lib1', ':lib2'],", " )"); ConfiguredTargetAndData binary = getConfiguredTargetAndData("//java/r/android:r"); diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaRuntimeTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaRuntimeTest.java index d1ea4c366a1aed..b81579e617dc77 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaRuntimeTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaRuntimeTest.java @@ -189,7 +189,7 @@ public void javaHomeGenerated() throws Exception { ")", "java_runtime(", " name = 'jvm', ", - " srcs = glob(['generated_java_home/**']), ", + " srcs = glob(['generated_java_home/**'], allow_empty = True), ", " java = 'generated_java_home/bin/java', ", " java_home = 'generated_java_home',", ")"); diff --git a/src/test/shell/integration/discard_graph_edges_test.sh b/src/test/shell/integration/discard_graph_edges_test.sh index 9c814d543f4327..a521670f5340d8 100755 --- a/src/test/shell/integration/discard_graph_edges_test.sh +++ b/src/test/shell/integration/discard_graph_edges_test.sh @@ -202,7 +202,7 @@ load(":bar.bzl", "bar") load(":baz.bzl", "baz") cc_library(name = 'cclib', srcs = ['cclib.cc']) genrule(name = 'histodump', - srcs = glob(["*.in"]), + srcs = glob(["*.in"], allow_empty = True), outs = ['histo.txt'], local = 1, tools = [':cclib'], diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl index f647e2c18f2669..e327c1c609563e 100644 --- a/tools/android/android_sdk_repository_template.bzl +++ b/tools/android/android_sdk_repository_template.bzl @@ -432,7 +432,7 @@ def create_system_images_filegroups(system_image_dirs): ) native.filegroup( name = "%s_qemu2_extra" % name, - srcs = native.glob(["%s/kernel-ranchu" % system_image_dir]), + srcs = native.glob(["%s/kernel-ranchu" % system_image_dir], allow_empty = True), ) else: # For supported system images that are not installed in the SDK, we diff --git a/tools/jdk/jdk.BUILD b/tools/jdk/jdk.BUILD index 6a95e85b09dca1..19b32cf75eaf36 100644 --- a/tools/jdk/jdk.BUILD +++ b/tools/jdk/jdk.BUILD @@ -181,6 +181,7 @@ filegroup( "lib/missioncontrol/**", "lib/visualvm/**", ], + allow_empty = True, ), )