From c5798bf82fc0ccd0bb90e0813d8e63df4d0576cc Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 9 Dec 2016 10:20:54 +0000 Subject: Revert^8 "Make sure that const-class linkage is preserved." Replaced two ReaderMutexLocks with WriterMutexLocks. Removed some unnecessary debugging output. Test: m test-art-host Bug: 30627598 Original-Change-Id: Ie9b721464b4e9a5dcce8df8095548e983bba1fe8 This reverts commit 2c8c6b63da6ecb2ac701cc30f9b4fa4a8eea5cc8. Change-Id: I3a1aeecf64e4b202cef61cceb248d48106a2f4a6 --- .../src-multidex/Helper2.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 test/626-const-class-linking/src-multidex/Helper2.java (limited to 'test/626-const-class-linking/src-multidex/Helper2.java') diff --git a/test/626-const-class-linking/src-multidex/Helper2.java b/test/626-const-class-linking/src-multidex/Helper2.java new file mode 100644 index 0000000000..5bb31eeb17 --- /dev/null +++ b/test/626-const-class-linking/src-multidex/Helper2.java @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2016 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. + */ + +public class Helper2 { + public static ClassPair get() { + Class helper2_class = Helper2.class; + Class test_class = Test.class; + return new ClassPair(helper2_class, test_class); + } +} -- cgit v1.2.3-59-g8ed1b