Strip whitespace from install_base_key before embedding it. This is already done for build-label.txt. RELNOTES: None. PiperOrigin-RevId: 277692098
diff --git a/src/BUILD b/src/BUILD index 28e3cc7..c7a463b 100644 --- a/src/BUILD +++ b/src/BUILD
@@ -6,7 +6,8 @@ exports_files(["jdeps_modules.golden"]) -md5_cmd = "set -e -o pipefail && echo $(SRCS) | sort | xargs cat | %s | awk '{ print $$1; }' > $@" +# Keep only the first 32 chars (a hex md5sum) and no trailing newline. +md5_cmd = "set -e -o pipefail && echo $(SRCS) | sort | xargs cat | %s | head -c 32 > $@" # TODO(bazel-team): find a better way to handle dylib extensions. filegroup(
diff --git a/src/main/cpp/archive_utils.cc b/src/main/cpp/archive_utils.cc index d785dbd..2beb881 100644 --- a/src/main/cpp/archive_utils.cc +++ b/src/main/cpp/archive_utils.cc
@@ -93,7 +93,6 @@ const devtools_ijar::u1 *data, const size_t size) override { string str(reinterpret_cast<const char *>(data), size); - blaze_util::StripWhitespace(&str); if (str.size() != 32) { BAZEL_DIE(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR) << "Failed to extract install_base_key: file size mismatch " @@ -182,7 +181,6 @@ const devtools_ijar::u1 *data, const size_t size) override { string contents(reinterpret_cast<const char *>(data), size); - blaze_util::StripWhitespace(&contents); *build_label_ = contents; }