diff options
author | Sorin Basca <sorinbasca@google.com> | 2022-09-06 19:02:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-06 19:02:38 +0000 |
commit | 307aa37079ac8e4f41f842c471d5a858715ff841 (patch) | |
tree | cda9bfcef1e3222e27b1fa8a5c35c35447a8d892 | |
parent | 3e78e30b61c9f2c0338e41ac15c1ac69d370d197 (diff) | |
parent | e2075a9453856c91a99e0ed6e5f18e66d878b444 (diff) | |
download | guice-307aa37079ac8e4f41f842c471d5a858715ff841.tar.gz |
Filter out OpenJDK warning message am: a9432ee7bd am: a78b3f4225 am: 6edd2fed3d am: 440d1e8089 am: e2075a9453
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2162361
Change-Id: I84ba236b7b62ef63153d2cdaba9e03994e023739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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)", } |