Merge "Remove the disabled test for zlib determinism."
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 84c9687..97d5838 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -629,7 +629,6 @@
],
static_libs: [
- "archive-patcher",
"core-compat-test-rules",
"core-java-9-language-tests",
"core-test-rules",
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index b700a96..80e1c97 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -1791,11 +1791,5 @@
result: EXEC_FAILED,
bug: 62408076,
name: "libcore.java.lang.reflect.annotations.AnnotatedElementParameterTest#testImplicitConstructorParameters_singleAnnotation"
-},
-{
- description: "Failing following zlib upgrade",
- result: EXEC_FAILED,
- bug: 135017266,
- name: "libcore.java.util.zip.DeflateRegressionTest#deterministicOutput"
}
]
diff --git a/luni/src/test/java/libcore/java/util/zip/DeflateRegressionTest.java b/luni/src/test/java/libcore/java/util/zip/DeflateRegressionTest.java
deleted file mode 100644
index d3b38a0..0000000
--- a/luni/src/test/java/libcore/java/util/zip/DeflateRegressionTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package libcore.java.util.zip;
-
-import com.google.archivepatcher.shared.DefaultDeflateCompatibilityWindow;
-import com.google.archivepatcher.shared.JreDeflateParameters;
-
-import org.junit.Test;
-
-import static org.junit.Assert.fail;
-
-import java.util.Map;
-
-/**
- * A regression test for Deflate and the underlying native libraries. If any of these tests fail
- * it suggests that tools such as Google Play Store that rely on deterministic binary output from
- * Deflate; those tools may behave inefficiently if the output changes.
- */
-public class DeflateRegressionTest {
-
- /*
- * If this test fails then it implies a change that could regress Android user performance.
- * Please check that the platform version of Deflate is still used by affected tools and notify
- * them. See also http://b/27637914.
- */
- @Test
- public void deterministicOutput() throws Exception {
- DefaultDeflateCompatibilityWindow compatibilityWindow
- = new DefaultDeflateCompatibilityWindow();
- if (!compatibilityWindow.isCompatible()) {
- Map<JreDeflateParameters, String>
- incompatibleValues = compatibilityWindow.getIncompatibleValues();
- fail("Incompatible values found: " + incompatibleValues);
- }
- }
-}
