From db197dc2238241abaf25c4bb0dcd89d186808492 Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Mon, 17 Oct 2022 09:43:37 +0000 Subject: Revert "Filter out OpenJDK warning message" This reverts commit a9432ee7bd5a17c465285dc443ba833dd326678d. Reason for revert: No longer needed after aosp/2245074 and aosp/2245353. Change-Id: I3f39244b7cff841fe561083705fbbd748a48b66c --- Android.bp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Android.bp b/Android.bp index 8a6bb031..9d2fb68d 100644 --- a/Android.bp +++ b/Android.bp @@ -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)", } -- cgit v1.2.3