Adjusts the filegroups generated for the Android NDK crosstool to correctly

include certain toolchain binaries.

RELNOTES: None.
PiperOrigin-RevId: 179694510

1 files changed, 4 insertions, 12 deletions

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 9bae5af644..b36534df35 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
@@ -7,26 +7,18 @@ cc_toolchain(
     all_files = ":%toolchainName%-all_files",
     compiler_files = ":%toolchainName%-all_files",
     cpu = "%cpu%",
-    dwp_files = ":%toolchainName%-toolchain_files",
+    dwp_files = ":%toolchainName%-all_files",
     dynamic_runtime_libs = [":%dynamicRuntimeLibs%"],
     linker_files = ":%toolchainName%-all_files",
-    objcopy_files = ":%toolchainName%-toolchain_files",
+    objcopy_files = ":%toolchainName%-all_files",
     static_runtime_libs = [":%staticRuntimeLibs%"],
-    strip_files = ":%toolchainName%-toolchain_files",
+    strip_files = ":%toolchainName%-all_files",
     supports_param_files = 0,
 )
 
 filegroup(
-    name = "%toolchainName%-toolchain_files",
-    srcs = glob(["ndk/toolchains/%toolchainDirectory%/**"]),
-    output_licenses = ["unencumbered"],
-)
-
-filegroup(
     name = "%toolchainName%-all_files",
-    srcs = [
-        ":%toolchainName%-toolchain_files",
-    ] + glob([
+    srcs = glob(["ndk/toolchains/%toolchainDirectory%/**"]) + glob([
         %toolchainFileGlobs%
     ]),
 )