Write classes in runtime-generated app image.

Test: 845-data-image
Bug: 260557058
Change-Id: I640b78942984ac3d3f8d24abda619d78154acd86

1 files changed, 1 insertions, 13 deletions

diff --git a/dex2oat/linker/image_writer.h b/dex2oat/linker/image_writer.h
index e5eeacc02d..f81df4e805 100644
--- a/dex2oat/linker/image_writer.h
+++ b/dex2oat/linker/image_writer.h
@@ -45,6 +45,7 @@
 #include "intern_table.h"
 #include "lock_word.h"
 #include "mirror/dex_cache.h"
+#include "oat.h"
 #include "oat_file.h"
 #include "obj_ptr.h"
 
@@ -229,18 +230,6 @@ class ImageWriter final {
   };
   friend std::ostream& operator<<(std::ostream& stream, NativeObjectRelocationType type);
 
-  enum class StubType {
-    kJNIDlsymLookupTrampoline,
-    kJNIDlsymLookupCriticalTrampoline,
-    kQuickGenericJNITrampoline,
-    kQuickIMTConflictTrampoline,
-    kQuickResolutionTrampoline,
-    kQuickToInterpreterBridge,
-    kNterpTrampoline,
-    kLast = kNterpTrampoline,
-  };
-  friend std::ostream& operator<<(std::ostream& stream, StubType stub_type);
-
   static constexpr size_t kBinBits =
       MinimumBitsToStore<uint32_t>(static_cast<size_t>(Bin::kMirrorCount) - 1);
   // uint32 = typeof(lockword_)
@@ -712,7 +701,6 @@ class ImageWriter final {
 
 std::ostream& operator<<(std::ostream& stream, ImageWriter::Bin bin);
 std::ostream& operator<<(std::ostream& stream, ImageWriter::NativeObjectRelocationType type);
-std::ostream& operator<<(std::ostream& stream, ImageWriter::StubType stub_type);
 
 }  // namespace linker
 }  // namespace art