commit 90ab1b89ebbcc4f65f9eb363177221f27d9b0bbd
author Sorin Basca <sorinbasca@google.com> Mon Oct 17 22:22:31 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 17 22:22:31 2022 +0000
tree 9ae87a678acc4ab5ce097e7b0b3570102d7723d6
parent e2075a9453856c91a99e0ed6e5f18e66d878b444
parent db197dc2238241abaf25c4bb0dcd89d186808492

Revert "Filter out OpenJDK warning message" am: db197dc223

Original change: https://android-review.googlesource.com/c/platform/external/guice/+/2257032

Change-Id: I10fa1548f6c791e50f91fc6870f55503bc553cef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 8a6bb03..9d2fb68 100644
--- a/Android.bp
+++ b/Android.bp
@@ -98,10 +98,6 @@
     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 @@
     ],
     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)",
 }