Revert "[dexopt] Allow secondary dex files to generate app images"
Revert submission 1210624-secimg
Bug: 149098478
Bug: 149168708
Reason for revert: Tests fail on device
Reverted Changes:
I87a0c2698: [art] Fix, re-enable and expand 596-app-images
I73592c597: [art] Enable compilation of secondary dexes by def...
I6cff0c8f2: [art] Expand test coverage of secondary app images...
Iaa04175ee: [dexopt] Allow secondary dex files to generate app...
Change-Id: Ic30045e59cce34749b3f31097d392072c44a7d7a
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.