diff options
author | Sorin Basca <sorinbasca@google.com> | 2022-10-17 23:25:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-17 23:25:56 +0000 |
commit | d2c17ce327f877c9eb1e9adddf76b566a33a07d5 (patch) | |
tree | 9ae87a678acc4ab5ce097e7b0b3570102d7723d6 | |
parent | 307aa37079ac8e4f41f842c471d5a858715ff841 (diff) | |
parent | 1c032724dea35d78166f3cfe505a0ad2a12175f6 (diff) | |
download | guice-d2c17ce327f877c9eb1e9adddf76b566a33a07d5.tar.gz |
Revert "Filter out OpenJDK warning message" am: db197dc223 am: 90ab1b89eb am: 1c032724de
Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2257032
Change-Id: Ie33bcafb7cc0fc28b24566ea0fe319a38e731cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -98,10 +98,6 @@ 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"], @@ -112,8 +108,7 @@ genrule { ], cmd: "for src in $(in); do " + " mkdir -p $$(dirname $(genDir)/$${src}) && " + - " $(location guice_munge) -DNO_AOP $${src} | " + - " sed '/Duplicate cpuset controllers detected/d' > $(genDir)/$${src} || exit 1; " + + " $(location guice_munge) -DNO_AOP $${src} > $(genDir)/$${src} || exit 1; " + " done && " + " $(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", } |