commit 0c2c222733f3bb1dc9848f4f127a47046fda6221
author Chang Xing <chxing@google.com> Fri Aug 04 14:36:17 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Jul 18 17:13:59 2019 +0000
tree bf46d1a9d1bf38dcbd01947b5ffcc28e659fbdef
parent 1a225a76ee6bc29833aee048b6cfae20242bdc8b

Revert^2 "Support clinit for app image during compilation"

Add some spot fixes for app image class initialization and re-enable
test 660 features.

Bug: 70735003
Test: test-art-host

This reverts commit abadf024efdc632f663d7fb503cd277b3f65fca2.

Change-Id: Id16fd3ada3eb1bd57ea60c3cdc4a0cf9835950d7

runtime/class_linker.h

diff --git a/runtime/class_linker.h b/runtime/class_linker.h
index 3605ffb..8269aaa 100644
--- a/runtime/class_linker.h
+++ b/runtime/class_linker.h
@@ -758,6 +758,10 @@
                                                          std::string* error_msg)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
+  virtual bool CanAllocClass() REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::dex_lock_) {
+    return true;
+  }
+
  private:
   class LinkInterfaceMethodsHelper;