Loading cmds/installd/dexopt.cpp +10 −0 Original line number Original line Diff line number Diff line Loading @@ -1763,10 +1763,20 @@ bool reconcile_secondary_dex_file(const std::string& dex_path, result = false; result = false; continue; continue; } } // Delete oat/vdex/art files. result = unlink_if_exists(oat_path) && result; result = unlink_if_exists(oat_path) && result; result = unlink_if_exists(create_vdex_filename(oat_path)) && result; result = unlink_if_exists(create_vdex_filename(oat_path)) && result; result = unlink_if_exists(create_image_filename(oat_path)) && result; result = unlink_if_exists(create_image_filename(oat_path)) && result; // Delete profiles. std::string current_profile = create_current_profile_path( multiuser_get_user_id(uid), dex_path, /*is_secondary*/true); std::string reference_profile = create_reference_profile_path( dex_path, /*is_secondary*/true); result = unlink_if_exists(current_profile) && result; result = unlink_if_exists(reference_profile) && result; // Try removing the directories as well, they might be empty. // Try removing the directories as well, they might be empty. result = rmdir_if_empty(oat_isa_dir) && result; result = rmdir_if_empty(oat_isa_dir) && result; result = rmdir_if_empty(oat_dir) && result; result = rmdir_if_empty(oat_dir) && result; Loading Loading
cmds/installd/dexopt.cpp +10 −0 Original line number Original line Diff line number Diff line Loading @@ -1763,10 +1763,20 @@ bool reconcile_secondary_dex_file(const std::string& dex_path, result = false; result = false; continue; continue; } } // Delete oat/vdex/art files. result = unlink_if_exists(oat_path) && result; result = unlink_if_exists(oat_path) && result; result = unlink_if_exists(create_vdex_filename(oat_path)) && result; result = unlink_if_exists(create_vdex_filename(oat_path)) && result; result = unlink_if_exists(create_image_filename(oat_path)) && result; result = unlink_if_exists(create_image_filename(oat_path)) && result; // Delete profiles. std::string current_profile = create_current_profile_path( multiuser_get_user_id(uid), dex_path, /*is_secondary*/true); std::string reference_profile = create_reference_profile_path( dex_path, /*is_secondary*/true); result = unlink_if_exists(current_profile) && result; result = unlink_if_exists(reference_profile) && result; // Try removing the directories as well, they might be empty. // Try removing the directories as well, they might be empty. result = rmdir_if_empty(oat_isa_dir) && result; result = rmdir_if_empty(oat_isa_dir) && result; result = rmdir_if_empty(oat_dir) && result; result = rmdir_if_empty(oat_dir) && result; Loading