Merge "Revert "[dexopt] Allow secondary dex files to generate app images"" am: 799cfc57c3 am: a0a62037e1
Change-Id: I1399542f44017ea278241d81d5f8a769a20dcf9a
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index e434afd..f95e445 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -1271,6 +1271,11 @@
Dex2oatFileWrapper maybe_open_app_image(const char* out_oat_path,
bool generate_app_image, bool is_public, int uid, bool is_secondary_dex) {
+ // We don't create an image for secondary dex files.
+ if (is_secondary_dex) {
+ return Dex2oatFileWrapper();
+ }
+
const std::string image_path = create_image_filename(out_oat_path);
if (image_path.empty()) {
// Happens when the out_oat_path has an unknown extension.