summaryrefslogtreecommitdiff
path: root/test/097-duplicate-method/src/Test.java
diff options
context:
space:
mode:
author Sebastien Hertz <shertz@google.com> 2016-03-22 08:32:34 +0100
committer Sebastien Hertz <shertz@google.com> 2016-03-22 11:23:52 +0100
commitb9131b191567e984a5f3a1d125b36014b67b47b6 (patch)
tree64a6416592c7ec32611adff4d8e6e4bd4145128c /test/097-duplicate-method/src/Test.java
parent1a9018ba74841ac507b96f0e0dd6b86b22778ca6 (diff)
Update run-test 097-duplicate-method
Runs the test with a precompiled classes.dex and re-enables it. We need to build a dex file with duplicate methods. We cannot do that with Jack (this is invalid) or smali (it does not keep duplicate methods, only one is in the dex). Therefore, having a precompiled dex file allows to run the test on whatever toolchain. In the future, we could update the test if a tool allows to generate it again. Change-Id: I3803aa0c2e99ca61d58b36e088d9bbe199e07d3c
Diffstat (limited to 'test/097-duplicate-method/src/Test.java')
-rw-r--r--test/097-duplicate-method/src/Test.java24
1 files changed, 0 insertions, 24 deletions
diff --git a/test/097-duplicate-method/src/Test.java b/test/097-duplicate-method/src/Test.java
deleted file mode 100644
index 7dd61e6928..0000000000
--- a/test/097-duplicate-method/src/Test.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2012 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.
- */
-
-/**
- * This class and method will be overwritten by smali to return non-null.
- */
-public class Test {
- public static Object run() {
- return null;
- }
-}