From 43e99be9db10111a2d6e094882cd06c248c69e11 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 15 Mar 2017 06:28:52 +0000 Subject: Revert "Revert "Revert "CHA for interface method.""" Breaks libcore tests. This reverts commit 8f301e26943c53485abc2da5ff1907f7c2e0ff0c. Change-Id: Iea46176118be9e05aceb06f2d290961bb1f38265 --- .../src-multidex/Base.java | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 test/616-cha-interface-default/src-multidex/Base.java (limited to 'test/616-cha-interface-default/src-multidex/Base.java') diff --git a/test/616-cha-interface-default/src-multidex/Base.java b/test/616-cha-interface-default/src-multidex/Base.java deleted file mode 100644 index 2cbcb500c4..0000000000 --- a/test/616-cha-interface-default/src-multidex/Base.java +++ /dev/null @@ -1,41 +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. - */ - -interface Base { - default public int foo(int i) { - if (i != 1) { - return -2; - } - return i + 10; - } - - // Test default method that's not inlined. - default public int $noinline$bar() { - System.out.print(""); - System.out.print(""); - System.out.print(""); - System.out.print(""); - System.out.print(""); - System.out.print(""); - System.out.print(""); - System.out.print(""); - return -1; - } - - default void printError(String msg) { - System.out.println(msg); - } -} -- cgit v1.2.3-59-g8ed1b