aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2022-09-06 16:41:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-09-06 16:41:46 +0000
commita78b3f42257241ff8887b0c94afa1b88151d8e9e (patch)
treecda9bfcef1e3222e27b1fa8a5c35c35447a8d892
parent3e78e30b61c9f2c0338e41ac15c1ac69d370d197 (diff)
parenta9432ee7bd5a17c465285dc443ba833dd326678d (diff)
downloadguice-a78b3f42257241ff8887b0c94afa1b88151d8e9e.tar.gz
Filter out OpenJDK warning message am: a9432ee7bd
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2162361 Change-Id: I79ad90eb08f22fb2264e5b0ece65446b30c74715 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 9d2fb68d..8a6bb031 100644
--- a/Android.bp
+++ b/Android.bp
@@ -98,6 +98,10 @@ java_binary_host {
libs: ["junit"],
}
+// Filter out warnings produced by OpenJDK to stdout, otherwise these warnings
+// make it into generated Java files (b/240131965).
+// TODO: Remove the filter is OpenJDK stops writing the warning to stdout (see
+// https://bugs.openjdk.org/browse/JDK-8270087).
genrule {
name: "guice_munged_srcs",
srcs: [":guice_srcs"],
@@ -108,7 +112,8 @@ genrule {
],
cmd: "for src in $(in); do " +
" mkdir -p $$(dirname $(genDir)/$${src}) && " +
- " $(location guice_munge) -DNO_AOP $${src} > $(genDir)/$${src} || exit 1; " +
+ " $(location guice_munge) -DNO_AOP $${src} | " +
+ " sed '/Duplicate cpuset controllers detected/d' > $(genDir)/$${src} || exit 1; " +
" done && " +
" $(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)",
}