Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0d105ba authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Remove obsolete DEXOPT_SAFEMODE. 

am: 2520d44e

Change-Id: I2f053a09a4eeb48bcee07bb0c9509709bb8dc50f
parents 3a6114f2 2520d44e

cmds/installd/otapreopt.cpp

+2 −2
Original line number Diff line number Diff line
@@ -472,7 +472,8 @@ private: 
                case 6: {

                    // Version 1 had:

                    constexpr int OLD_DEXOPT_PUBLIC         = 1 << 1;

                    constexpr int OLD_DEXOPT_SAFEMODE       = 1 << 2;

                    // Note: DEXOPT_SAFEMODE has been removed.

                    // constexpr int OLD_DEXOPT_SAFEMODE       = 1 << 2;

                    constexpr int OLD_DEXOPT_DEBUGGABLE     = 1 << 3;

                    constexpr int OLD_DEXOPT_BOOTCOMPLETE   = 1 << 4;

                    constexpr int OLD_DEXOPT_PROFILE_GUIDED = 1 << 5;
@@ -480,7 +481,6 @@ private: 
                    int input = atoi(param);

                    package_parameters_.dexopt_flags =

                            ReplaceMask(input, OLD_DEXOPT_PUBLIC, DEXOPT_PUBLIC) |

                            ReplaceMask(input, OLD_DEXOPT_SAFEMODE, DEXOPT_SAFEMODE) |

                            ReplaceMask(input, OLD_DEXOPT_DEBUGGABLE, DEXOPT_DEBUGGABLE) |

                            ReplaceMask(input, OLD_DEXOPT_BOOTCOMPLETE, DEXOPT_BOOTCOMPLETE) |

                            ReplaceMask(input, OLD_DEXOPT_PROFILE_GUIDED, DEXOPT_PROFILE_GUIDED) |